X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fecdec_filter.c;h=1c3a37849d1309fbf3b676bf04c513628dc1c657;hp=950c1a1f2af3731023c302b3ae5758ff876d7dda;hb=534a94f441767947874cb15d18211edf758e9277;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953

diff --git a/fecdec_filter.c b/fecdec_filter.c
index 950c1a1f..1c3a3784 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -47,7 +47,7 @@ struct fec_header {
 	uint16_t slice_bytes;
 	/** Non-zero if this group is the beginning of the stream. */
 	uint8_t bos;
-	/** Non-zero if this stream embedds audio headers into fec groups. */
+	/** Non-zero if this stream embeds audio headers into fec groups. */
 	uint8_t header_stream;
 };
 
@@ -171,7 +171,7 @@ static struct fecdec_group *free_oldest_group(struct private_fecdec_data *pfd)
 			oldest = fg;
 	}
 	if (!group_complete(oldest) && !group_empty(oldest))
-		PARA_WARNING_LOG("Clearing incomplete group %d "
+		PARA_WARNING_LOG("Clearing incomplete group %u "
 			"(contains %d slices)\n", oldest->h.group_num,
 			oldest->num_received_slices);
 	if (oldest == pfd->first_complete_group)
@@ -224,7 +224,7 @@ static int add_slice(char *buf, struct fecdec_group *fg)
 	uint8_t slice_num = fg->h.slice_num;
 
 	if (group_complete(fg)) {
-		PARA_DEBUG_LOG("group %d complete, ignoring slice %d\n",
+		PARA_DEBUG_LOG("group %u complete, ignoring slice %d\n",
 			fg->h.group_num, slice_num);
 		return 0;
 	}
@@ -236,7 +236,7 @@ static int add_slice(char *buf, struct fecdec_group *fg)
 	r = fg->num_received_slices;
 	/* Check if we already have this slice. */
 	if (test_and_set_slice_bit(fg, slice_num)) {
-		PARA_INFO_LOG("ignoring duplicate slice %d:%d\n", fg->h.group_num,
+		PARA_INFO_LOG("ignoring duplicate slice %u:%d\n", fg->h.group_num,
 			slice_num);
 		return 0;
 	}
@@ -293,10 +293,10 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
 	char *buf = NULL;
 
 	if (u == FEC_GROUP_UNUSABLE) {
-		PARA_INFO_LOG("dropping unusable group %d\n", fg->h.group_num);
+		PARA_INFO_LOG("dropping unusable group %u\n", fg->h.group_num);
 		return 0;
 	}
-	PARA_DEBUG_LOG("decoding group %d (%d slices)\n", fg->h.group_num,
+	PARA_DEBUG_LOG("decoding group %u (%d slices)\n", fg->h.group_num,
 		fg->h.data_slices_per_group);
 	ret = fec_decode(pfd->fec, fg->data, fg->idx, sb);
 	if (ret < 0)
@@ -307,7 +307,7 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
 		i = DIV_ROUND_UP(fg->h.audio_header_size, fg->h.slice_bytes);
 		PARA_DEBUG_LOG("skipping %d header slices\n", i);
 	}
-	PARA_DEBUG_LOG("writing group %d (%d/%d decoded data bytes)\n",
+	PARA_DEBUG_LOG("writing group %u (%u/%d decoded data bytes)\n",
 		fg->h.group_num, fg->h.group_bytes,
 		fg->h.data_slices_per_group * sb);
 	need = (fg->h.data_slices_per_group - i) * sb;
@@ -409,7 +409,7 @@ static int dispatch_slice(char *buf, size_t len, struct fec_header *h,
 	ret = fec_new(k, n, &pfd->fec);
 	if (ret < 0)
 		return ret;
-	pfd->btrp = btr_pool_new("fecdec", 64 * 1024);
+	pfd->btrp = btr_pool_new("fecdec", 128 * 1024);
 	/* decode and clear the first group */
 	ret = decode_group(pfd->first_complete_group, fn);
 	if (ret < 0)
@@ -436,9 +436,9 @@ static void fecdec_close(struct filter_node *fn)
 	fn->private_data = NULL;
 }
 
-static void fecdec_post_select(__a_unused struct sched *s, struct task *t)
+static int fecdec_post_select(__a_unused struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct btr_node *btrn = fn->btrn;
 	int ret;
 	struct fec_header h;
@@ -468,9 +468,9 @@ next_buffer:
 	btr_consume(btrn, FEC_HEADER_SIZE + h.slice_bytes);
 	goto next_buffer;
 out:
-	t->error = ret;
 	if (ret < 0)
-		btr_remove_node(btrn);
+		btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 static void fecdec_open(struct filter_node *fn)