X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fecdec_filter.c;h=6aa9071e6ea1bbabcf5d874f07b67da71a06db20;hp=87b6a3669d6f1ab929dbf7a913f2bf237dcfaef6;hb=c708253b998a6253ddc5f18b9403fe27aad5e99b;hpb=a1457929be2401590a0be305a215cf770a8bd787

diff --git a/fecdec_filter.c b/fecdec_filter.c
index 87b6a366..6aa9071e 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -28,7 +28,7 @@
 #define NUM_FEC_GROUPS 3
 
 /** Size of the output buffer of the fecdec filter. */
-#define FECDEC_OUTBUF_SIZE 81920
+#define FECDEC_OUTBUF_SIZE (128 * 1024)
 
 /** Data read from the header of a slice. */
 struct fec_header {
@@ -78,14 +78,8 @@ struct private_fecdec_data {
 #define FOR_EACH_FECDEC_GROUP(g, d) for (g = (d)->groups; \
 	(g) - (d)->groups < NUM_FEC_GROUPS; (g)++)
 
-/** */
-#define UNUSED_GROUP_NUM 0xffffffff
-
 static int group_complete(struct fecdec_group *fg)
 {
-	if (fg->h.group_num == UNUSED_GROUP_NUM)
-		return 0;
-	//PARA_INFO_LOG("received slices: %u, slices per group: %u\n", fg->num_received_slices, fg->h.data_slices_per_group);
 	return fg->num_received_slices >= fg->h.data_slices_per_group;
 }
 
@@ -98,10 +92,6 @@ static void clear_group(struct fecdec_group *fg)
 {
 	int i;
 
-	if (!group_complete(fg) && !group_empty(fg))
-		PARA_WARNING_LOG("Clearing incomplete group %d "
-			"(contains %d slices)\n", fg->h.group_num,
-			fg->num_received_slices);
 	for (i = 0; i < fg->num_slices; i++) {
 		free(fg->data[i]);
 		fg->data[i] = NULL;
@@ -112,7 +102,6 @@ static void clear_group(struct fecdec_group *fg)
 	fg->num_slices = 0;
 	memset(&fg->h, 0, sizeof(struct fec_header));
 	fg->num_received_slices = 0;
-	fg->h.group_num = UNUSED_GROUP_NUM;
 }
 
 static int find_group(struct fec_header *h,
@@ -123,7 +112,10 @@ static int find_group(struct fec_header *h,
 	FOR_EACH_FECDEC_GROUP(fg, pfd) {
 		if (fg->h.group_num != h->group_num)
 			continue;
-		/* FIXME: Add some more sanity checks here */
+		if (fg->h.slices_per_group != h->slices_per_group)
+			continue;
+		if (fg->h.data_slices_per_group != h->data_slices_per_group)
+			continue;
 		*result = fg;
 		return 1;
 	}
@@ -162,6 +154,10 @@ static struct fecdec_group *free_oldest_group(struct private_fecdec_data *pfd)
 		if (!oldest || oldest->h.group_num > fg->h.group_num)
 			oldest = fg;
 	}
+	if (!group_complete(oldest) && !group_empty(oldest))
+		PARA_WARNING_LOG("Clearing incomplete group %d "
+			"(contains %d slices)\n", fg->h.group_num,
+			fg->num_received_slices);
 	clear_group(oldest);
 	return oldest;
 }