X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_recv.c;h=905d580e1ba4dcf00872e40cf1119878e09794bb;hp=1443ab46e7c278ecf27dde13eba6788d86d0cde2;hb=298ad3958d76fc775dfd0503ae4b1e43dce70f04;hpb=044dd6b25189b24d862d50b965fc2feaf93b01d7

diff --git a/ortp_recv.c b/ortp_recv.c
index 1443ab46..905d580e 100644
--- a/ortp_recv.c
+++ b/ortp_recv.c
@@ -66,30 +66,8 @@ 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,
+		__a_unused fd_set *rfds, __a_unused fd_set *wfds,
 		struct timeval *timeout)
 {
 	struct private_ortp_recv_data *pord = rn->private_data;
@@ -105,31 +83,23 @@ static int ortp_recv_pre_select(struct receiver_node *rn,
 	return -1; /* we did not modify the fd sets */
 }
 
-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};
-//	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))
-/** \endcond */
-
 
-static int ortp_recv_post_select(struct receiver_node *rn, int select_ret,
-	__unused fd_set *rfds, __unused fd_set *wfds)
+static int ortp_recv_post_select(struct receiver_node *rn,
+		__a_unused int select_ret, __a_unused fd_set *rfds,
+		__a_unused fd_set *wfds)
 {
 	struct private_ortp_recv_data *pord = rn->private_data;
 	mblk_t *mp;
@@ -139,35 +109,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 +144,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 +157,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 +172,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,8 +200,11 @@ static int ortp_recv_post_select(struct receiver_node *rn, int select_ret,
 	}
 success:
 	freemsg(mp);
-	pord->c_bad = 0;
-	compute_next_chunk(&now, chunk_time, pord);
+	if (pord->c_bad) {
+		pord->c_bad = 0;
+		pord->next_chunk = now;
+	}
+	compute_next_chunk(chunk_time, pord);
 	return 1;
 err_out:
 	freemsg(mp);
@@ -259,7 +230,7 @@ static void *ortp_recv_parse_config(int argc, char **argv)
 {
 	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)
@@ -271,7 +242,7 @@ 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;
-	struct gengetopt_args_info *conf = rn->conf;
+	struct ortp_recv_args_info *conf = rn->conf;
 
 	rn->buf = para_calloc(CHUNK_SIZE);
 
@@ -281,6 +252,11 @@ 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);
+	if (conf->jitter_compensation_arg) {
+		rtp_session_enable_adaptive_jitter_compensation(pord->session, TRUE);
+		rtp_session_set_jitter_compensation(pord->session,
+			conf->jitter_compensation_arg);
+	}
 	return 1;
 }