X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=03218e249ec3b69b8863c245628514a5ae32a225;hp=1f1f1aa666ffa0a63dfbd8bb72e591b264c3a20e;hb=3d32ae4802777abf524da9314a9c0bf9259d815e;hpb=d70cae532cf1c06a393d6e63b491179c900557a9

diff --git a/audiod.c b/audiod.c
index 1f1f1aa6..03218e24 100644
--- a/audiod.c
+++ b/audiod.c
@@ -732,30 +732,36 @@ static int update_item(int itemnum, char *buf)
 
 static int parse_stream_command(const char *txt, char **cmd)
 {
-	char *p = strchr(txt, ':');
-	int i;
+	int ret, len;
+	char *re, *p = strchr(txt, ':');
 
 	if (!p)
 		return -E_MISSING_COLON;
-	p++;
-	FOR_EACH_AUDIO_FORMAT(i) {
-		if (strncmp(txt, audio_formats[i], strlen(audio_formats[i])))
-			continue;
-		*cmd = p;
-		return i;
-	}
-	return -E_UNSUPPORTED_AUDIO_FORMAT;
+	*cmd = p + 1;
+	len = p - txt;
+	re = malloc(len + 1);
+	strncpy(re, txt, len);
+	re[len] = '\0';
+	ret = get_matching_audio_format_nums(re);
+	free(re);
+	return ret;
 }
 
 static int add_filter(int format, char *cmdline)
 {
 	struct audio_format_info *a = &afi[format];
 	int filter_num, nf = a->num_filters;
+	void *cfg;
 
-	filter_num = check_filter_arg(cmdline, &a->filter_conf[nf]);
+	filter_num = check_filter_arg(cmdline, &cfg);
 	if (filter_num < 0)
 		return filter_num;
+	a->filter_conf = para_realloc(a->filter_conf,
+		(nf + 1) * sizeof(void *));
+	a->filter_nums = para_realloc(a->filter_nums,
+		(nf + 1) * sizeof(unsigned));
 	a->filter_nums[nf] = filter_num;
+	a->filter_conf[nf] = cfg;
 	a->num_filters++;
 	PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf,
 		filters[filter_num].name);
@@ -764,36 +770,35 @@ static int add_filter(int format, char *cmdline)
 
 static int parse_writer_args(void)
 {
-	int i, ret, nw;
+	int i, ret;
 	char *cmd;
 	struct audio_format_info *a;
 
-	nw = PARA_MAX(1U, conf.writer_given);
-	PARA_INFO_LOG("maximal number of writers: %d\n", nw);
-	FOR_EACH_AUDIO_FORMAT(i) {
-		a = &afi[i];
-		a->writer_conf = para_malloc(nw * sizeof(void *));
-		a->writer_nums = para_malloc(nw * sizeof(int));
-		a->num_writers = 0;
-	}
 	for (i = 0; i < conf.writer_given; i++) {
 		void *wconf;
-		int writer_num;
+		int j, nw, writer_num, af_mask;
+
 		ret = parse_stream_command(conf.writer_arg[i], &cmd);
 		if (ret < 0)
 			goto out;
-		a = &afi[ret];
-		nw = a->num_writers;
-		wconf = check_writer_arg(cmd, &writer_num);
-		if (!wconf) {
-			ret = writer_num;
-			goto out;
+		af_mask = ret;
+		FOR_EACH_AUDIO_FORMAT(j) {
+			a = afi + j;
+			if ((af_mask & (1 << j)) == 0) /* no match */
+				continue;
+			ret = -E_WRITE_COMMON_SYNTAX;
+			wconf = check_writer_arg(cmd, &writer_num);
+			if (!wconf)
+				goto out;
+			nw = a->num_writers;
+			a->writer_nums = para_realloc(a->writer_nums, (nw + 1) * sizeof(int));
+			a->writer_conf = para_realloc(a->writer_conf, (nw + 1) * sizeof(void *));
+			a->writer_nums[nw] = writer_num;
+			a->writer_conf[nw] = wconf;
+			PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[writer_num],
+				nw, writer_names[writer_num]);
+			a->num_writers++;
 		}
-		a->writer_nums[nw] = writer_num;
-		a->writer_conf[nw] = wconf;
-		PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
-			nw, writer_names[writer_num]);
-		a->num_writers++;
 	}
 	ret = 1;
 out:
@@ -807,16 +812,10 @@ static int parse_receiver_args(void)
 	struct audio_format_info *a;
 
 	for (i = conf.receiver_given - 1; i >= 0; i--) {
-		char *arg = conf.receiver_arg[i];
-		char *recv_arg = strchr(arg, ':');
-		int af_mask, j;
+		char *arg;
+		int j, af_mask;
 
-		ret = -E_MISSING_COLON;
-		if (!recv_arg)
-			goto out;
-		*recv_arg = '\0';
-		recv_arg++;
-		ret = get_matching_audio_format_nums(arg);
+		ret = parse_stream_command(conf.receiver_arg[i], &arg);
 		if (ret < 0)
 			goto out;
 		af_mask = ret;
@@ -832,7 +831,7 @@ static int parse_receiver_args(void)
 			 */
 			if (a->receiver_conf)
 				a->receiver->free_config(a->receiver_conf);
-			a->receiver_conf = check_receiver_arg(recv_arg, &receiver_num);
+			a->receiver_conf = check_receiver_arg(arg, &receiver_num);
 			ret = -E_RECV_SYNTAX;
 			if (!a->receiver_conf)
 				goto out;
@@ -876,8 +875,8 @@ 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.
+		 * udp and dccp streams are fec-encoded, so add fecdec as the
+		 * first filter.
 		 */
 		if (strcmp(afi[i].receiver->name, "udp") == 0 ||
 				strcmp(afi[i].receiver->name, "dccp") == 0) {
@@ -910,30 +909,23 @@ out:
 
 static int parse_filter_args(void)
 {
-	int i, ret, nf;
+	int i, j, ret, af_mask;
 
-	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 *));
-		afi[i].filter_nums = para_malloc(nf * sizeof(unsigned));
-	}
 	if (!conf.no_default_filters_given)
 		return init_default_filters();
 	for (i = 0; i < conf.filter_given; i++) {
-		char *arg = conf.filter_arg[i];
-		char *filter_name = strchr(arg, ':');
-		ret = -E_MISSING_COLON;
-		if (!filter_name)
-			goto out;
-		*filter_name = '\0';
-		filter_name++;
-		ret = get_audio_format_num(arg);
-		if (ret < 0)
-			goto out;
-		ret = add_filter(ret, filter_name);
+		char *arg;
+		ret = parse_stream_command(conf.filter_arg[i], &arg);
 		if (ret < 0)
 			goto out;
+		af_mask = ret;
+		FOR_EACH_AUDIO_FORMAT(j) {
+			if ((af_mask & (1 << j)) == 0) /* no match */
+				continue;
+			ret = add_filter(j, arg);
+			if (ret < 0)
+				goto out;
+		}
 	}
 	ret = init_default_filters(); /* use default values for the rest */
 out: