X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_recv.c;h=d9b260980e89f0a0c06d9de72cb390de0075aeef;hp=4df8e3a5af040521c8c8fd38fed97a22e042382b;hb=685a2bc66e77978104039b8173a6039a80d8b733;hpb=15c54cf98b77882a8f4d59a550948133341ad671

diff --git a/ortp_recv.c b/ortp_recv.c
index 4df8e3a5..d9b26098 100644
--- a/ortp_recv.c
+++ b/ortp_recv.c
@@ -21,6 +21,8 @@
 #include "para.h"
 
 #include "ortp.h"
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "ortp_recv.cmdline.h"
 
@@ -38,7 +40,6 @@ extern int msg_to_buf(mblk_t *, char *, int);
  * \sa receiver receiver_node
  */
 struct private_ortp_recv_data {
-
 /**
  *
  *
@@ -66,24 +67,22 @@ uint32_t timestamp;
 uint32_t chunk_ts;
 };
 
-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 = t->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;
 	}
-	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;
+	t->ret = 1;
 }
 
-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};
@@ -96,52 +95,49 @@ static void compute_next_chunk(struct timeval *now, unsigned chunk_time,
 		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 = t->private_data;
 	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];
-	struct timeval now;
 	unsigned chunk_time;
 
-	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)
-				return 1;
+//	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;
+		return;
 	}
+	t->ret = 1;
+	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) {
 		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++;
+		t->ret = -E_TOO_MANY_BAD_CHUNKS;
 		if ((pord->c_bad > 5000 && pord->start.tv_sec) || pord->c_bad > 10000)
-			return -E_TOO_MANY_BAD_CHUNKS;
-		tv_add(&now, &min_delay, &pord->next_chunk);
-		return 1;
+			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;
-	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;
+		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;
 		else
-			ret = 0;
+			t->ret = -E_ORTP_RECV_EOF;
 		goto err_out;
 	}
 	packet_type = READ_PACKET_TYPE(tmpbuf);
@@ -154,65 +150,67 @@ static int ortp_recv_post_select(struct receiver_node *rn, int select_ret,
 	switch (packet_type) {
 	unsigned header_len, payload_len;
 	case ORTP_EOF:
-		ret = 0;
+		rn->eof = 1;
+		t->ret = -E_ORTP_RECV_EOF;
 		goto err_out;
 	case ORTP_BOF:
-		PARA_INFO_LOG("bof (%d)\n", ret);
+		PARA_INFO_LOG("bof (%d)\n", t->ret);
 		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 (ret + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
-			ret = -E_OVERRUN;
+		if (t->ret + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
+			t->ret = -E_OVERRUN;
 			goto err_out;
 		}
-		if (ret > ORTP_AUDIO_HEADER_LEN) {
+		if (t->ret > 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;
+				t->ret - ORTP_AUDIO_HEADER_LEN);
+			rn->loaded += t->ret - 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",
-			ret, header_len);
+			t->ret, 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;
+				t->ret - ORTP_AUDIO_HEADER_LEN);
+			rn->loaded = t->ret - ORTP_AUDIO_HEADER_LEN;
 			goto success;
 		}
-		if (header_len + ORTP_AUDIO_HEADER_LEN > ret) {
-			ret = -E_INVALID_HEADER;
+		if (header_len + ORTP_AUDIO_HEADER_LEN > t->ret) {
+			t->ret = -E_INVALID_HEADER;
 			goto err_out;
 		}
-		payload_len = ret - ORTP_AUDIO_HEADER_LEN - header_len;
+		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);
 		if (rn->loaded + payload_len > CHUNK_SIZE) {
-			ret = -E_OVERRUN;
+			t->ret = -E_OVERRUN;
 			goto err_out;
 		}
 		if (payload_len)
 			memcpy(rn->buf + rn->loaded, tmpbuf
-				+ (ret - payload_len), payload_len);
+				+ (t->ret - payload_len), payload_len);
 		rn->loaded += payload_len;
 		goto success;
 	}
 success:
+	t->ret = 1;
 	freemsg(mp);
 	if (pord->c_bad) {
 		pord->c_bad = 0;
-		pord->next_chunk = now;
+		pord->next_chunk = *now;
 	}
-	compute_next_chunk(&now, chunk_time, pord);
-	return 1;
+	compute_next_chunk(chunk_time, pord);
+	return;
 err_out:
+	rn->eof = 1;
 	freemsg(mp);
-	return ret;
 }
 
 static void ortp_shutdown(void)
@@ -234,7 +232,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)
@@ -246,7 +244,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);