X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_recv.c;h=164c1cb0be3a2e344ef3e74cc3e11521d64fb4c6;hp=c9696729609a7af3698ff046dc3e149cae67308a;hb=02000a1a24aa9d4f3e437821dc1f2f6b792bc79a;hpb=ae0e4594c6a0312c5b4b4c0bde86f9c12253d11b diff --git a/ortp_recv.c b/ortp_recv.c index c9696729..164c1cb0 100644 --- a/ortp_recv.c +++ b/ortp_recv.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 2005-2007 Andre Noll + * Copyright (C) 2005-2008 Andre Noll * - * 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 */ @@ -97,7 +85,7 @@ static int msg_to_buf(mblk_t *mp, char *buffer, int len) static void ortp_recv_pre_select(struct sched *s, struct task *t) { - struct receiver_node *rn = t->private_data; + struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_ortp_recv_data *pord = rn->private_data; struct timeval tmp; @@ -107,7 +95,6 @@ static void ortp_recv_pre_select(struct sched *s, struct task *t) } if (tv_diff(&s->timeout, &tmp, NULL) > 0) s->timeout = tmp; - t->ret = 1; } static void compute_next_chunk(unsigned chunk_time, @@ -126,7 +113,7 @@ static void compute_next_chunk(unsigned chunk_time, static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t) { - struct receiver_node *rn = t->private_data; + struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_ortp_recv_data *pord = rn->private_data; mblk_t *mp; int packet_type, stream_type; @@ -135,12 +122,10 @@ static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t) size_t packet_size; // PARA_INFO_LOG("rn: %p, pord: %p, session: %p\n", rn, pord, pord->session); - t->ret = -E_ORTP_RECV_EOF; - if (rn->output_eof && *rn->output_eof) { - rn->eof = 1; + if (rn->output_error && *rn->output_error < 0) { + t->error = *rn->output_error; return; } - t->ret = 1; if (pord->start.tv_sec) if (tv_diff(now, &pord->next_chunk, NULL) < 0) return; @@ -150,26 +135,25 @@ static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t) // PARA_INFO_LOG("nope, chunk_ts = %d, loaded: %d, bad: %d\n", // pord->timestamp, rn->loaded, pord->c_bad); pord->c_bad++; - t->ret = -E_TOO_MANY_BAD_CHUNKS; - if ((pord->c_bad > 5000 && pord->start.tv_sec) || pord->c_bad > 10000) + if ((pord->c_bad > 5000 && pord->start.tv_sec) || pord->c_bad > 10000) { + t->error = -E_TOO_MANY_BAD_CHUNKS; return; - t->ret = 1; + } tv_add(now, &min_delay, &pord->next_chunk); return; } /* okay, we have a chunk of data */ if (!pord->start.tv_sec) pord->start = *now; - t->ret = msg_to_buf(mp, tmpbuf, CHUNK_SIZE); - if (t->ret < ORTP_AUDIO_HEADER_LEN) { - rn->eof = 1; - if (t->ret < 0) - t->ret = -E_MSG_TO_BUF; + 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 - t->ret = -E_ORTP_RECV_EOF; + t->error = -E_ORTP_RECV_EOF; goto err_out; } - packet_size = t->ret; + packet_size = t->error; packet_type = READ_PACKET_TYPE(tmpbuf); stream_type = READ_STREAM_TYPE(tmpbuf); chunk_time = READ_CHUNK_TIME(tmpbuf); @@ -180,8 +164,7 @@ static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t) switch (packet_type) { unsigned header_len, payload_len; case ORTP_EOF: - rn->eof = 1; - t->ret = -E_ORTP_RECV_EOF; + t->error = -E_RECV_EOF; goto err_out; case ORTP_BOF: PARA_INFO_LOG("bof (%zu)\n", packet_size); @@ -191,9 +174,10 @@ static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t) if (!pord->have_header && stream_type) /* can't use the data, wait for header */ goto success; - t->ret = -E_OVERRUN; - if (packet_size + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) + if (packet_size + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) { + t->error = -E_OVERRUN; goto err_out; + } if (packet_size > ORTP_AUDIO_HEADER_LEN) { memcpy(rn->buf + rn->loaded, tmpbuf + ORTP_AUDIO_HEADER_LEN, packet_size - ORTP_AUDIO_HEADER_LEN); @@ -211,21 +195,22 @@ static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t) rn->loaded = packet_size - ORTP_AUDIO_HEADER_LEN; goto success; } - t->ret = -E_INVALID_HEADER; - if (header_len + ORTP_AUDIO_HEADER_LEN > packet_size) + if (header_len + ORTP_AUDIO_HEADER_LEN > packet_size) { + t->error = -E_INVALID_HEADER; goto err_out; + } payload_len = packet_size - ORTP_AUDIO_HEADER_LEN - header_len; - t->ret = -E_OVERRUN; - if (rn->loaded + payload_len > CHUNK_SIZE) + if (rn->loaded + payload_len > CHUNK_SIZE) { + t->error = -E_OVERRUN; goto err_out; + } if (payload_len) memcpy(rn->buf + rn->loaded, tmpbuf + (packet_size - payload_len), payload_len); rn->loaded += payload_len; - goto success; } success: - t->ret = 1; + t->error = 0; freemsg(mp); if (pord->c_bad) { pord->c_bad = 0; @@ -234,7 +219,6 @@ success: compute_next_chunk(chunk_time, pord); return; err_out: - rn->eof = 1; freemsg(mp); } @@ -281,11 +265,9 @@ static int ortp_recv_open(struct receiver_node *rn) 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); - if (c->jitter_compensation_arg) { - rtp_session_enable_adaptive_jitter_compensation(pord->session, TRUE); - rtp_session_set_jitter_compensation(pord->session, + rtp_session_enable_adaptive_jitter_compensation(pord->session, TRUE); + rtp_session_set_jitter_compensation(pord->session, c->jitter_compensation_arg); - } return 1; }