X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=76a6af64e00e6c5b9527cd3eff03d7ce285071e2;hp=dd6022889280eb6b19980ccdb0750af1306401fc;hb=cf2dd5eac38421fdeaaccd08ec34efe27f9a858d;hpb=50fac71430f5993560d40eb5044d45d8255d7ca6

diff --git a/audiod.c b/audiod.c
index dd602288..76a6af64 100644
--- a/audiod.c
+++ b/audiod.c
@@ -549,16 +549,13 @@ static int open_receiver(int format)
 	int ret, slot_num;
 	struct receiver *r = a->receiver;
 	struct receiver_node *rn;
-	const struct timeval restart_delay = {2, 0};
 
+	tv_add(now, &(struct timeval)EMBRACE(2, 0), &a->restart_barrier);
 	ret = get_empty_slot();
 	if (ret < 0)
-		goto err;
+		return ret;
 	slot_num = ret;
-	s = &slot[slot_num];
-	s->format = format;
-	s->receiver_node = para_calloc(sizeof(struct receiver_node));
-	rn = s->receiver_node;
+	rn = para_calloc(sizeof(*rn));
 	rn->receiver = r;
 	rn->conf = a->receiver_conf;
 	rn->btrn = btr_new_node(&(struct btr_node_description)
@@ -567,21 +564,18 @@ static int open_receiver(int format)
 	if (ret < 0) {
 		btr_free_node(rn->btrn);
 		free(rn);
-		s->receiver_node = NULL;
-		goto err;
+		return ret;
 	}
+	s = &slot[slot_num];
+	s->format = format;
+	s->receiver_node = rn;
 	PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
-		audio_formats[s->format], r->name, slot_num);
+		audio_formats[format], r->name, slot_num);
 	rn->task.pre_select = r->pre_select;
 	rn->task.post_select = r->post_select;
 	sprintf(rn->task.status, "%s receiver node", r->name);
 	register_task(&rn->task);
-	ret = slot_num;
-err:
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-	tv_add(now, &restart_delay, &afi[format].restart_barrier);
-	return ret;
+	return slot_num;
 }
 
 /* return: 0: Not running, 1: Running, -1: Running but eof (or error) */
@@ -873,6 +867,17 @@ static int init_default_filters(void)
 
 		if (a->num_filters)
 			continue; /* no default -- nothing to to */
+		/*
+		 * If udp is used to receive this audiod format, add fecdec as
+		 * the first filter.
+		 */
+		if (strcmp(afi[i].receiver->name, "udp") == 0) {
+			tmp = para_strdup("fecdec");
+			add_filter(i, tmp);
+			free(tmp);
+			if (ret < 0)
+				goto out;
+		}
 		/* add "dec" to audio format name */
 		tmp = make_message("%sdec", audio_formats[i]);
 		for (j = 0; filters[j].name; j++)
@@ -898,7 +903,7 @@ static int parse_filter_args(void)
 {
 	int i, ret, nf;
 
-	nf = PARA_MAX(1U, conf.filter_given);
+	nf = PARA_MAX(2U, conf.filter_given);
 	PARA_INFO_LOG("maximal number of filters: %d\n", nf);
 	FOR_EACH_AUDIO_FORMAT(i) {
 		afi[i].filter_conf = para_malloc(nf * sizeof(void *));
@@ -1131,8 +1136,10 @@ static void start_stop_decoders(void)
 	if (!must_start_decoder())
 		return;
 	ret = open_receiver(stat_task->current_audio_format_num);
-	if (ret < 0)
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		return;
+	}
 	sl = slot + ret;
 	a = afi + sl->format;
 	if (a->num_filters)