/*
- * 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 */
static int msg_to_buf(mblk_t *mp, char *buffer, int len)
{
- int rlen = len;
mblk_t *m, *mprev;
- int mlen;
+ size_t mlen, rlen = len;
m = mp->b_cont;
mprev = mp;
while (m != NULL) {
- mlen = (int) (m->b_wptr - m->b_rptr);
+ mlen = m->b_wptr - m->b_rptr;
if (mlen <= rlen) {
mblk_t *consumed = m;
- memcpy (buffer, m->b_rptr, mlen);
+ memcpy(buffer, m->b_rptr, mlen);
/* go to next mblk_t */
mprev->b_cont = m->b_cont;
m = m->b_cont;
freeb (consumed);
buffer += mlen;
rlen -= mlen;
- } else { /*if mlen>rlen */
+ } else {
memcpy (buffer, m->b_rptr, rlen);
m->b_rptr += rlen;
return 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;
}
if (tv_diff(&s->timeout, &tmp, NULL) > 0)
s->timeout = tmp;
- t->ret = 1;
}
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;
char tmpbuf[CHUNK_SIZE + 3];
unsigned chunk_time;
+ 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;
// 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->error;
packet_type = READ_PACKET_TYPE(tmpbuf);
stream_type = READ_STREAM_TYPE(tmpbuf);
chunk_time = READ_CHUNK_TIME(tmpbuf);
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 (%d)\n", t->ret);
+ PARA_INFO_LOG("bof (%zu)\n", packet_size);
pord->have_header = 1;
/* fall through */
case ORTP_DATA:
if (!pord->have_header && stream_type)
/* can't use the data, wait for header */
goto success;
- if (t->ret + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
- t->ret = -E_OVERRUN;
+ if (packet_size + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
+ t->error = -E_OVERRUN;
goto err_out;
}
- if (t->ret > ORTP_AUDIO_HEADER_LEN) {
+ if (packet_size > ORTP_AUDIO_HEADER_LEN) {
memcpy(rn->buf + rn->loaded, tmpbuf + ORTP_AUDIO_HEADER_LEN,
- t->ret - ORTP_AUDIO_HEADER_LEN);
- rn->loaded += t->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);
- PARA_DEBUG_LOG("header packet (%d bytes), header len: %d\n",
- t->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,
- t->ret - ORTP_AUDIO_HEADER_LEN);
- rn->loaded = t->ret - ORTP_AUDIO_HEADER_LEN;
+ packet_size - ORTP_AUDIO_HEADER_LEN);
+ rn->loaded = packet_size - ORTP_AUDIO_HEADER_LEN;
goto success;
}
- if (header_len + ORTP_AUDIO_HEADER_LEN > t->ret) {
- t->ret = -E_INVALID_HEADER;
+ if (header_len + ORTP_AUDIO_HEADER_LEN > packet_size) {
+ t->error = -E_INVALID_HEADER;
goto err_out;
}
- payload_len = t->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) {
- t->ret = -E_OVERRUN;
+ t->error = -E_OVERRUN;
goto err_out;
}
if (payload_len)
memcpy(rn->buf + rn->loaded, tmpbuf
- + (t->ret - payload_len), payload_len);
+ + (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;
compute_next_chunk(chunk_time, pord);
return;
err_out:
- rn->eof = 1;
freemsg(mp);
}
{
int ret;
- struct ortp_recv_args_info *tmp = para_calloc(sizeof(struct ortp_recv_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)
pord->session = rtp_session_new(RTP_SESSION_RECVONLY);
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);
- 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;
}
projects / paraslash.git / blobdiff