From 1583369f6defebc7f44249b9ce4cc01f717db3b9 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 2 May 2009 12:53:54 +0200 Subject: [PATCH] Re-revert "Auto-adjust fecdec output buffer size." This re-applies commit 35f9051506345255c7ed3c076b7df5f3b7d26039 which should work due to the previous output buffer patch. --- fecdec_filter.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/fecdec_filter.c b/fecdec_filter.c index 5f37f1a8..1f57dd12 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 { @@ -256,7 +258,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); @@ -279,12 +281,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; @@ -391,7 +399,7 @@ static void fecdec_close(struct filter_node *fn) 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; -- 2.39.2