X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fecdec_filter.c;h=a3cba9bbd0b3821b545a3aed6a7bb8606ec97b95;hp=a7d1875c271e8f8889d20eeff62a119ce11380d5;hb=afb43ec103ea5c0e194451c1289c514faee3b2e5;hpb=f97bcd9d55344c8f1232470eac01974cd53a9d7f

diff --git a/fecdec_filter.c b/fecdec_filter.c
index a7d1875c..a3cba9bb 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -27,8 +27,10 @@
  */
 #define NUM_FEC_GROUPS 3
 
-/** Size of the output buffer of the fecdec filter. */
-#define FECDEC_OUTBUF_SIZE (1024 * 1024) /* FIXME: This has to depend on the fec params */
+/** Default size of the output buffer of the fecdec filter. */
+#define FECDEC_DEFAULT_OUTBUF_SIZE (3 * 1024)
+/** Maximal size of the output buffer of the fecdec filter. */
+#define FECDEC_MAX_OUTBUF_SIZE (1024 * 1024)
 
 /** Data read from the header of a slice. */
 struct fec_header {
@@ -76,6 +78,7 @@ struct private_fecdec_data {
 	struct fec_parms *fec;
 	/** Keeps track of what was received so far. */
 	struct fecdec_group groups[NUM_FEC_GROUPS];
+	/** Whether an audio file header was already received. */
 	int have_header;
 };
 
@@ -117,10 +120,15 @@ static int find_group(struct fec_header *h,
 	FOR_EACH_FECDEC_GROUP(fg, pfd) {
 		if (fg->h.group_num != h->group_num)
 			continue;
+		if (fg->num_received_slices == 0)
+			goto success;
 		if (fg->h.slices_per_group != h->slices_per_group)
-			continue;
+			return -E_BAD_FEC_HEADER;
 		if (fg->h.data_slices_per_group != h->data_slices_per_group)
-			continue;
+			return -E_BAD_FEC_HEADER;
+		if (fg->h.group_bytes != h->group_bytes)
+			return -E_BAD_FEC_HEADER;
+success:
 		*result = fg;
 		return 1;
 	}
@@ -161,8 +169,8 @@ static struct fecdec_group *free_oldest_group(struct private_fecdec_data *pfd)
 	}
 	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);
+			"(contains %d slices)\n", oldest->h.group_num,
+			oldest->num_received_slices);
 	clear_group(oldest);
 	return oldest;
 }
@@ -251,7 +259,7 @@ static enum fec_group_usability group_is_usable(struct fecdec_group *fg,
 static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
 {
 	int i, ret, sb = fg->h.slice_bytes;
-	size_t written = 0;
+	size_t written = 0, need;
 	struct private_fecdec_data *pfd = fn->private_data;
 	enum fec_group_usability u = group_is_usable(fg, pfd);
 
@@ -274,12 +282,18 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
 	PARA_DEBUG_LOG("writing group %d (%d/%d decoded data bytes)\n",
 		fg->h.group_num, fg->h.group_bytes,
 		fg->h.data_slices_per_group * sb);
+	need = fn->loaded + (fg->h.data_slices_per_group - i)* sb;
+	if (need > fn->bufsize) {
+		fn->bufsize = PARA_MAX(fn->bufsize * 2, need);
+		if (fn->bufsize > FECDEC_MAX_OUTBUF_SIZE)
+			return -E_FECDEC_OVERRUN;
+		PARA_INFO_LOG("increasing fec buf to %zu\n", fn->bufsize);
+		fn->buf = para_realloc(fn->buf, fn->bufsize);
+	}
 	for (; i < fg->h.data_slices_per_group; i++) {
 		size_t n = sb;
 		if (n + written > fg->h.group_bytes)
 			n = fg->h.group_bytes - written;
-		if (fn->loaded + n > fn->bufsize)
-			return -E_FECDEC_OVERRUN;
 		memcpy(fn->buf + fn->loaded, fg->data[i], n);
 		fn->loaded += n;
 		written += n;
@@ -358,7 +372,7 @@ static ssize_t fecdec(char *buf, size_t len, struct filter_node *fn)
 	ret = read_fec_header(buf, len, &h);
 	if (ret <= 0)
 		return ret;
-	if (!h.slice_bytes || h.slice_bytes > fn->bufsize)
+	if (!h.slice_bytes)
 		return -E_BAD_SLICE_SIZE;
 	if (h.slice_num > h.slices_per_group)
 		return -E_BAD_SLICE_NUM;
@@ -379,13 +393,14 @@ static void fecdec_close(struct filter_node *fn)
 		clear_group(fg);
 	free(fn->buf);
 	fn->buf = NULL;
+	fec_free(pfd->fec);
 	free(fn->private_data);
 	fn->private_data = NULL;
 }
 
 static void fecdec_open(struct filter_node *fn)
 {
-	fn->bufsize = FECDEC_OUTBUF_SIZE;
+	fn->bufsize = FECDEC_DEFAULT_OUTBUF_SIZE;
 	fn->buf = para_malloc(fn->bufsize);
 	fn->private_data = para_calloc(sizeof(struct private_fecdec_data));
 	fn->loaded = 0;