stdin: Abort if the consumer terminates.
[paraslash.git] / ortp_recv.c
index 71c8b10..164c1cb 100644 (file)
@@ -1,26 +1,16 @@
 /*
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file ortp_recv.c paraslash's ortp receiver */
 
  */
 /** \file ortp_recv.c paraslash's ortp receiver */
 
-#include "para.h"
 #include <ortp/ortp.h>
 #include <ortp/ortp.h>
+#include "para.h"
 
 #include "ortp.h"
 
 #include "ortp.h"
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "ortp_recv.cmdline.h"
 
 #include "recv.h"
 #include "ortp_recv.cmdline.h"
 
 
 #define CHUNK_SIZE 128 * 1024
 
 
 #define CHUNK_SIZE 128 * 1024
 
-extern gint msg_to_buf(mblk_t *, char *, gint);
-
 /**
  * data specific to the ortp receiver
  *
  * \sa receiver receiver_node
  */
 struct private_ortp_recv_data {
 /**
  * data specific to the ortp receiver
  *
  * \sa receiver receiver_node
  */
 struct private_ortp_recv_data {
-
 /**
  *
  *
 /**
  *
  *
@@ -61,183 +48,178 @@ struct timeval next_chunk;
 /** number of consecutive bad chunks */
 int c_bad;
 /** the current timestamp which is passed to the receiving function of libortp */
 /** number of consecutive bad chunks */
 int c_bad;
 /** the current timestamp which is passed to the receiving function of libortp */
-guint32 timestamp;
+uint32_t timestamp;
 /** \a timestamp increases by this amount */
 /** \a timestamp increases by this amount */
-guint32 chunk_ts;
+uint32_t chunk_ts;
 };
 
 };
 
-#if 1
-static void recalc_timestamp(struct receiver_node *rn)
-{
-       struct timeval now, tmp, min_delay = {0, 5000};
-       struct private_ortp_recv_data *pord = rn->private_data;
-
-       gettimeofday(&now, NULL);
-       tv_add(&now, &min_delay, &pord->next_chunk);
-       if (pord->start.tv_sec) {
-               int new_ts;
 
 
-               tv_diff(&now, &pord->start, &tmp);
-               new_ts = rtp_session_time_to_ts(pord->session, tv2ms(&tmp));
-//             if (pord->c_bad > 50)
-                       pord->timestamp = new_ts;
-       } else
-               pord->timestamp = 0;
-       PARA_DEBUG_LOG("ts=%u, c_bad = %d\n", pord->timestamp, pord->c_bad);
+static int msg_to_buf(mblk_t *mp, char *buffer, int len)
+{
+       mblk_t *m, *mprev;
+       size_t mlen, rlen = len;
 
 
+       m = mp->b_cont;
+       mprev = mp;
+       while (m != NULL) {
+               mlen = m->b_wptr - m->b_rptr;
+               if (mlen <= rlen) {
+                       mblk_t *consumed = m;
+                       memcpy(buffer, m->b_rptr, mlen);
+                       /* go to next mblk_t */
+                       mprev->b_cont = m->b_cont;
+                       m = m->b_cont;
+                       consumed->b_cont = NULL;
+                       freeb (consumed);
+                       buffer += mlen;
+                       rlen -= mlen;
+               } else {
+                       memcpy (buffer, m->b_rptr, rlen);
+                       m->b_rptr += rlen;
+                       return len;
+               }
+       }
+       return len - rlen;
 }
 }
-#endif
 
 
-static int ortp_recv_pre_select(struct receiver_node *rn,
-               __unused fd_set *rfds, __unused fd_set *wfds,
-               struct timeval *timeout)
+
+static void ortp_recv_pre_select(struct sched *s, struct task *t)
 {
 {
+       struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_ortp_recv_data *pord = rn->private_data;
        struct private_ortp_recv_data *pord = rn->private_data;
-       struct timeval now, tmp;
+       struct timeval tmp;
 
 
-       gettimeofday(&now, NULL);
-       if (tv_diff(&now, &pord->next_chunk, &tmp) >= 0) {
+       if (tv_diff(now, &pord->next_chunk, &tmp) >= 0) {
                tmp.tv_sec = 0;
                tmp.tv_usec = 1000;
        }
                tmp.tv_sec = 0;
                tmp.tv_usec = 1000;
        }
-       if (tv_diff(timeout, &tmp, NULL) > 0)
-               *timeout = tmp;
-       return -1; /* we did not modify the fd sets */
+       if (tv_diff(&s->timeout, &tmp, NULL) > 0)
+               s->timeout = tmp;
 }
 
 }
 
-static void compute_next_chunk(struct timeval *now, unsigned chunk_time,
+static void compute_next_chunk(unsigned chunk_time,
                struct private_ortp_recv_data *pord)
 {
        struct timeval chunk_tv = {0, chunk_time};
                struct private_ortp_recv_data *pord)
 {
        struct timeval chunk_tv = {0, chunk_time};
-//     if (!pord->start.tv_sec) {
-//             pord->start = *now;
-//             tv_add(&chunk_tv, now, &pord->next_chunk);
-//     } else
-       {
-               struct timeval tmp;
-               tv_add(&chunk_tv, &pord->next_chunk, &tmp);
-               pord->next_chunk = tmp;
-       }
+       struct timeval tmp;
+
+       tv_add(&chunk_tv, &pord->next_chunk, &tmp);
+       pord->next_chunk = tmp;
        pord->timestamp += pord->chunk_ts;
        pord->timestamp += pord->chunk_ts;
-       PARA_DEBUG_LOG("next chunk (ts = %d) due at %lu:%lu\n",
-               pord->timestamp, pord->next_chunk.tv_sec,
-               pord->next_chunk.tv_usec);
+//     PARA_DEBUG_LOG("next chunk (ts = %d) due at %lu:%lu\n",
+//             pord->timestamp, pord->next_chunk.tv_sec,
+//             pord->next_chunk.tv_usec);
 }
 }
-/** \cond */
-#define BUF_TO_VAL(buf) (((unsigned)(buf)[1] & 0xff) +  256 * ((unsigned)(buf)[0] & 0xff))
-/** \endcond */
-
 
 
-static int ortp_recv_post_select(struct receiver_node *rn, int select_ret,
-       __unused fd_set *rfds, __unused fd_set *wfds)
+static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t)
 {
 {
+       struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_ortp_recv_data *pord = rn->private_data;
        mblk_t *mp;
        struct private_ortp_recv_data *pord = rn->private_data;
        mblk_t *mp;
-       int ret, packet_type, stream_type;
+       int packet_type, stream_type;
        char tmpbuf[CHUNK_SIZE + 3];
        char tmpbuf[CHUNK_SIZE + 3];
-       struct timeval now;
        unsigned chunk_time;
        unsigned chunk_time;
+       size_t packet_size;
 
 
-       gettimeofday(&now, NULL);
-       PARA_DEBUG_LOG("rn: %p, pord: %p, session: %p\n", rn, pord, pord->session);
-       if (pord->start.tv_sec) {
-               struct timeval diff;
-               if (tv_diff(&now, &pord->next_chunk, &diff) < 0) {
-                       long unsigned diff_ms = tv2ms(&diff);
-                       if (diff_ms > 5) {
-                               PARA_DEBUG_LOG("too early: %lu ms left\n",
-                                       diff_ms);
-                               return 1;
-                       }
-               }
+//     PARA_INFO_LOG("rn: %p, pord: %p, session: %p\n", rn, pord, pord->session);
+       if (rn->output_error && *rn->output_error < 0) {
+               t->error = *rn->output_error;
+               return;
        }
        }
+       if (pord->start.tv_sec)
+               if (tv_diff(now, &pord->next_chunk, NULL) < 0)
+                       return;
        mp = rtp_session_recvm_with_ts(pord->session, pord->timestamp);
        if (!mp) {
        mp = rtp_session_recvm_with_ts(pord->session, pord->timestamp);
        if (!mp) {
+               struct timeval min_delay = {0, 100};
+//             PARA_INFO_LOG("nope, chunk_ts = %d, loaded: %d, bad: %d\n",
+//                     pord->timestamp, rn->loaded, pord->c_bad);
                pord->c_bad++;
                pord->c_bad++;
-               if ((pord->c_bad > 500 && pord->start.tv_sec) || pord->c_bad > 10000)
-                       return -E_TOO_MANY_BAD_CHUNKS;
-//             PARA_NOTICE_LOG("did not receive buffer, ts=%u, c_bad = %d, to = %lu\n",
-//                     pord->timestamp, pord->c_bad, tv2ms(&tmp));
-               if (pord->c_bad > 100)
-                       recalc_timestamp(rn);
-               return 1;
+               if ((pord->c_bad > 5000 && pord->start.tv_sec) || pord->c_bad > 10000) {
+                       t->error = -E_TOO_MANY_BAD_CHUNKS;
+                       return;
+               }
+               tv_add(now, &min_delay, &pord->next_chunk);
+               return;
        }
        /* okay, we have a chunk of data */
        }
        /* okay, we have a chunk of data */
-       PARA_DEBUG_LOG("have it ts = %d, chunk_ts = %d, loaded: %d, bad: %d\n",
-               pord->timestamp, pord->chunk_ts, rn->loaded, pord->c_bad);
        if (!pord->start.tv_sec)
        if (!pord->start.tv_sec)
-               pord->start = now;
-       ret = msg_to_buf(mp, tmpbuf, CHUNK_SIZE);
-       if (ret < ORTP_AUDIO_HEADER_LEN) {
-               if (ret < 0)
-                       ret = -E_MSG_TO_BUF;
+               pord->start = *now;
+       t->error = msg_to_buf(mp, tmpbuf, CHUNK_SIZE);
+       if (t->error < ORTP_AUDIO_HEADER_LEN) {
+               if (t->error < 0)
+                       t->error = -E_MSG_TO_BUF;
                else
                else
-                       ret = 0;
+                       t->error = -E_ORTP_RECV_EOF;
                goto err_out;
        }
                goto err_out;
        }
+       packet_size = t->error;
        packet_type = READ_PACKET_TYPE(tmpbuf);
        stream_type = READ_STREAM_TYPE(tmpbuf);
        chunk_time = READ_CHUNK_TIME(tmpbuf);
        pord->chunk_ts = READ_CHUNK_TS(tmpbuf);
        packet_type = READ_PACKET_TYPE(tmpbuf);
        stream_type = READ_STREAM_TYPE(tmpbuf);
        chunk_time = READ_CHUNK_TIME(tmpbuf);
        pord->chunk_ts = READ_CHUNK_TS(tmpbuf);
-       PARA_DEBUG_LOG("packet type: %d, stream type: %d, chunk time: %u, chunk_ts: %u\n", packet_type,
-               stream_type, chunk_time, pord->chunk_ts);
+//     PARA_INFO_LOG("packet type: %d, stream type: %d, chunk time: %u,"
+//             " chunk_ts: %u, loaded: %u, bad: %d\n", packet_type,
+//             stream_type, chunk_time, pord->chunk_ts, rn->loaded, pord->c_bad);
        switch (packet_type) {
        unsigned header_len, payload_len;
        case ORTP_EOF:
        switch (packet_type) {
        unsigned header_len, payload_len;
        case ORTP_EOF:
-               ret = 0;
+               t->error = -E_RECV_EOF;
                goto err_out;
        case ORTP_BOF:
                goto err_out;
        case ORTP_BOF:
-               PARA_INFO_LOG("bof (%d)\n", ret);
+               PARA_INFO_LOG("bof (%zu)\n", packet_size);
                pord->have_header = 1;
                /* fall through */
        case ORTP_DATA:
                pord->have_header = 1;
                /* fall through */
        case ORTP_DATA:
-               if (!pord->have_header && stream_type) /* can't use the data, wait for header */
+               if (!pord->have_header && stream_type)
+               /* can't use the data, wait for header */
                        goto success;
                        goto success;
-               if (ret + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
-                       ret = -E_OVERRUN;
+               if (packet_size + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
+                       t->error = -E_OVERRUN;
                        goto err_out;
                }
                        goto err_out;
                }
-               if (ret > ORTP_AUDIO_HEADER_LEN) {
+               if (packet_size > ORTP_AUDIO_HEADER_LEN) {
                        memcpy(rn->buf + rn->loaded, tmpbuf + ORTP_AUDIO_HEADER_LEN,
                        memcpy(rn->buf + rn->loaded, tmpbuf + ORTP_AUDIO_HEADER_LEN,
-                               ret - ORTP_AUDIO_HEADER_LEN);
-                       rn->loaded += ret - ORTP_AUDIO_HEADER_LEN;
+                               packet_size - ORTP_AUDIO_HEADER_LEN);
+                       rn->loaded += packet_size - ORTP_AUDIO_HEADER_LEN;
                }
                goto success;
        case ORTP_HEADER:
                header_len = READ_HEADER_LEN(tmpbuf);
                }
                goto success;
        case ORTP_HEADER:
                header_len = READ_HEADER_LEN(tmpbuf);
-               PARA_DEBUG_LOG("header packet (%d bytes), header len: %d\n", ret, header_len);
+               PARA_DEBUG_LOG("header packet (%zu bytes), header len: %d\n",
+                       packet_size, header_len);
                if (!pord->have_header) {
                        pord->have_header = 1;
                        memcpy(rn->buf, tmpbuf + ORTP_AUDIO_HEADER_LEN,
                if (!pord->have_header) {
                        pord->have_header = 1;
                        memcpy(rn->buf, tmpbuf + ORTP_AUDIO_HEADER_LEN,
-                               ret - ORTP_AUDIO_HEADER_LEN);
-                       rn->loaded = ret - ORTP_AUDIO_HEADER_LEN;
+                               packet_size - ORTP_AUDIO_HEADER_LEN);
+                       rn->loaded = packet_size - ORTP_AUDIO_HEADER_LEN;
                        goto success;
                }
                        goto success;
                }
-               if (header_len + ORTP_AUDIO_HEADER_LEN > ret) {
-                       ret = -E_INVALID_HEADER;
+               if (header_len + ORTP_AUDIO_HEADER_LEN > packet_size) {
+                       t->error = -E_INVALID_HEADER;
                        goto err_out;
                }
                        goto err_out;
                }
-               payload_len = ret - ORTP_AUDIO_HEADER_LEN - header_len;
-//             PARA_INFO_LOG("len: %d header_len: %d, payload_len: %d, loaded: %d\n", ret,
-//                     header_len, payload_len, rn->loaded);
+               payload_len = packet_size - ORTP_AUDIO_HEADER_LEN - header_len;
                if (rn->loaded + payload_len > CHUNK_SIZE) {
                if (rn->loaded + payload_len > CHUNK_SIZE) {
-                       ret = -E_OVERRUN;
+                       t->error = -E_OVERRUN;
                        goto err_out;
                }
                if (payload_len)
                        memcpy(rn->buf + rn->loaded, tmpbuf
                        goto err_out;
                }
                if (payload_len)
                        memcpy(rn->buf + rn->loaded, tmpbuf
-                               + (ret - payload_len), payload_len);
+                               + (packet_size - payload_len), payload_len);
                rn->loaded += payload_len;
                rn->loaded += payload_len;
-               goto success;
        }
 success:
        }
 success:
+       t->error = 0;
        freemsg(mp);
        freemsg(mp);
-       pord->c_bad = 0;
-       compute_next_chunk(&now, chunk_time, pord);
-       return 1;
+       if (pord->c_bad) {
+               pord->c_bad = 0;
+               pord->next_chunk = *now;
+       }
+       compute_next_chunk(chunk_time, pord);
+       return;
 err_out:
        freemsg(mp);
 err_out:
        freemsg(mp);
-       return ret;
 }
 
 static void ortp_shutdown(void)
 }
 
 static void ortp_shutdown(void)
@@ -259,7 +241,8 @@ static void *ortp_recv_parse_config(int argc, char **argv)
 {
        int ret;
 
 {
        int ret;
 
-       struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info));
+       struct ortp_recv_args_info *tmp =
+               para_calloc(sizeof(struct ortp_recv_args_info));
 
        ret = ortp_recv_cmdline_parser(argc, argv, tmp)? -E_ORTP_SYNTAX : 1;
        if (ret > 0)
 
        ret = ortp_recv_cmdline_parser(argc, argv, tmp)? -E_ORTP_SYNTAX : 1;
        if (ret > 0)
@@ -271,16 +254,20 @@ static void *ortp_recv_parse_config(int argc, char **argv)
 static int ortp_recv_open(struct receiver_node *rn)
 {
        struct private_ortp_recv_data *pord;
 static int ortp_recv_open(struct receiver_node *rn)
 {
        struct private_ortp_recv_data *pord;
-       struct gengetopt_args_info *conf = rn->conf;
+       struct ortp_recv_args_info *c = rn->conf;
 
        rn->buf = para_calloc(CHUNK_SIZE);
 
        rn->private_data = para_calloc(sizeof(struct private_ortp_recv_data));
        pord = rn->private_data;
        pord->session = rtp_session_new(RTP_SESSION_RECVONLY);
 
        rn->buf = para_calloc(CHUNK_SIZE);
 
        rn->private_data = para_calloc(sizeof(struct private_ortp_recv_data));
        pord = rn->private_data;
        pord->session = rtp_session_new(RTP_SESSION_RECVONLY);
-       PARA_NOTICE_LOG("receiving from %s:%d\n", conf->host_arg, conf->port_arg);
-       rtp_session_set_local_addr(pord->session, conf->host_arg, conf->port_arg);
+       PARA_NOTICE_LOG("receiving from %s:%d\n", c->host_arg, c->port_arg);
+       rtp_session_set_local_addr(pord->session, c->host_arg, c->port_arg);
+       rtp_session_set_remote_addr(pord->session, c->host_arg, c->port_arg);
        rtp_session_set_payload_type(pord->session, PAYLOAD_AUDIO_CONTINUOUS);
        rtp_session_set_payload_type(pord->session, PAYLOAD_AUDIO_CONTINUOUS);
+       rtp_session_enable_adaptive_jitter_compensation(pord->session, TRUE);
+       rtp_session_set_jitter_compensation(pord->session,
+                       c->jitter_compensation_arg);
        return 1;
 }
 
        return 1;
 }
 
@@ -301,5 +288,4 @@ void ortp_recv_init(struct receiver *r)
        r->parse_config = ortp_recv_parse_config;
 
        ortp_init();
        r->parse_config = ortp_recv_parse_config;
 
        ortp_init();
-       ortp_set_debug_file("oRTP", NULL);
 }
 }