From: Andre Date: Tue, 14 Mar 2006 17:41:10 +0000 (+0100) Subject: fixes for ortp-0.9.1 X-Git-Tag: v0.2.12~151 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=548dc9e5c82f891637968d3e0f5b4fa3d16a8405;hp=c8ca222a5dfee03f5ac8ccaf1d1bbf8a45f0874c fixes for ortp-0.9.1 turn on adaptive jitter compensation. ortp-0.9.1 seems to be unhappy without it. This patch also contains some simplifications and timing improvements. --- diff --git a/ortp_recv.c b/ortp_recv.c index 1443ab46..58245090 100644 --- a/ortp_recv.c +++ b/ortp_recv.c @@ -66,28 +66,6 @@ uint32_t timestamp; 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); - -} -#endif - static int ortp_recv_pre_select(struct receiver_node *rn, __unused fd_set *rfds, __unused fd_set *wfds, struct timeval *timeout) @@ -109,22 +87,18 @@ static void compute_next_chunk(struct timeval *now, unsigned 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; 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)) +#define BUF_TO_VAL(buf) (((unsigned)(buf)[1] & 0xff) + 256 \ + * ((unsigned)(buf)[0] & 0xff)) /** \endcond */ @@ -139,35 +113,30 @@ static int ortp_recv_post_select(struct receiver_node *rn, int select_ret, unsigned chunk_time; gettimeofday(&now, NULL); - PARA_DEBUG_LOG("rn: %p, pord: %p, session: %p\n", rn, pord, pord->session); +// 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); + if (tv_diff(&now, &pord->next_chunk, &diff) < 0) return 1; - } - } } 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++; - if ((pord->c_bad > 500 && pord->start.tv_sec) || pord->c_bad > 10000) + if ((pord->c_bad > 5000 && 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); + tv_add(&now, &min_delay, &pord->next_chunk); return 1; } /* 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) pord->start = now; ret = msg_to_buf(mp, tmpbuf, CHUNK_SIZE); +// PARA_DEBUG_LOG("have it ts = %d, chunk_ts = %d, loaded: %d, " +// "bad: %d, len: %d\n", pord->timestamp, pord->chunk_ts, +// rn->loaded, pord->c_bad, ret); if (ret < ORTP_AUDIO_HEADER_LEN) { if (ret < 0) ret = -E_MSG_TO_BUF; @@ -179,8 +148,9 @@ static int ortp_recv_post_select(struct receiver_node *rn, int select_ret, 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: @@ -191,7 +161,8 @@ static int ortp_recv_post_select(struct receiver_node *rn, int select_ret, 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; if (ret + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) { ret = -E_OVERRUN; @@ -205,7 +176,8 @@ static int ortp_recv_post_select(struct receiver_node *rn, int select_ret, 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 (%d bytes), header len: %d\n", + ret, header_len); if (!pord->have_header) { pord->have_header = 1; memcpy(rn->buf, tmpbuf + ORTP_AUDIO_HEADER_LEN, @@ -232,7 +204,10 @@ static int ortp_recv_post_select(struct receiver_node *rn, int select_ret, } success: freemsg(mp); - pord->c_bad = 0; + if (pord->c_bad) { + pord->c_bad = 0; + pord->next_chunk = now; + } compute_next_chunk(&now, chunk_time, pord); return 1; err_out: @@ -281,6 +256,8 @@ static int ortp_recv_open(struct receiver_node *rn) 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); 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, 40); return 1; } diff --git a/ortp_send.c b/ortp_send.c index fbd4077e..fd9a9a11 100644 --- a/ortp_send.c +++ b/ortp_send.c @@ -103,6 +103,8 @@ static void ortp_init_session(struct ortp_target *ot) if (!ot->session) return; s = ot->session; + rtp_session_enable_adaptive_jitter_compensation(ot->session, TRUE); + rtp_session_set_jitter_compensation(ot->session, 40); // rtp_session_set_jitter_compensation(ot->session, 100); /* always successful */ rtp_session_set_send_payload_type(s, PAYLOAD_AUDIO_CONTINUOUS); @@ -160,7 +162,7 @@ static void ortp_send(struct audio_format *af, long unsigned current_chunk, } if (!ot->chunk_ts) ot->chunk_ts = rtp_session_time_to_ts(ot->session, tv2ms(&af->chunk_tv)); -// PARA_DEBUG_LOG("len: %d, af: %p, ts: %d\n", len, af, ot->chunk_ts); + PARA_DEBUG_LOG("len: %d, ts: %lu, ts: %d\n", len, ot->chunk_ts * chunks_sent, ot->chunk_ts); ot->streaming = 1; } if (list_empty(&targets))