Merge commit 'meins/next' into next

[paraslash.git] / fecdec_filter.c

diff --git a/fecdec_filter.c b/fecdec_filter.c
index 1f57dd123eb86d906740f347a58a6d8ab27c28cf..ca9dcd739e23c6fe7e89d4ff67cec41686906318 100644 (file)
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -4,7 +4,9 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file fecdec_filter.c A filter fec-decodes an audio stream. */
+/** \file fecdec_filter.c A filter that fec-decodes an audio stream. */
+
+#include <regex.h>
 
 #include <dirent.h>
 #include "para.h"
@@ -70,6 +72,20 @@ struct fecdec_group {
        unsigned char **data;
 };
 
+/**
+ * The fecdec filter defers decoding of the first group until the first slice
+ * of the next group was received. This avoids buffer underruns in subsequent
+ * filters of the filter chain.
+ */
+enum group_completion_status {
+       /** No complete group received so far. */
+       GCS_NO_COMPLETE_GROUP,
+       /** First group received, but not yet decoded. */
+       GCS_FIRST_GROUP_COMPLETE,
+       /** At least one complete group decoded. */
+       GCS_FIRST_GROUP_DECODED,
+};
+
 /**
  * Data private to the fecdec filter.
  */
@@ -78,7 +94,12 @@ 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;
+       /** See \ref group_completion_status. */
+       unsigned completion_status;
+       /** Points to the first received group. */
+       struct fecdec_group *first_complete_group;
 };
 
 /** Iterate over all fecdec groups. */
@@ -152,6 +173,13 @@ static struct fecdec_group *try_to_free_group(struct private_fecdec_data *pfd)
        FOR_EACH_FECDEC_GROUP(fg, pfd) {
                if (!group_complete(fg))
                        continue;
+               /*
+                * Don't clear the first complete group if it has not yet been
+                * decoded.
+                */
+               if (pfd->completion_status == GCS_FIRST_GROUP_COMPLETE
+                               && pfd->first_complete_group == fg)
+                       continue;
                clear_group(fg);
                return fg;
        }
@@ -170,6 +198,8 @@ static struct fecdec_group *free_oldest_group(struct private_fecdec_data *pfd)
                PARA_WARNING_LOG("Clearing incomplete group %d "
                        "(contains %d slices)\n", oldest->h.group_num,
                        oldest->num_received_slices);
+       assert(pfd->completion_status != GCS_FIRST_GROUP_COMPLETE
+               || oldest != pfd->first_complete_group);
        clear_group(oldest);
        return oldest;
 }
@@ -210,8 +240,8 @@ static int add_slice(char *buf, struct fecdec_group *fg)
        int r, slice_num;
 
        if (group_complete(fg)) {
-               PARA_DEBUG_LOG("group complete, ignoring slice %d\n",
-                       fg->h.slice_num);
+               PARA_DEBUG_LOG("group %d complete, ignoring slice %d\n",
+                       fg->h.group_num, fg->h.slice_num);
                fg->num_received_slices++;
                return 0;
        }
@@ -266,7 +296,7 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
                PARA_INFO_LOG("dropping unusable group %d\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 %d (%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)
@@ -338,7 +368,7 @@ static int dispatch_slice(char *buf, size_t len, struct fec_header *h,
                struct filter_node *fn)
 {
        struct fecdec_group *fg;
-       int ret;
+       int ret, k, n;
        struct private_fecdec_data *pfd = fn->private_data;
 
        if (h->slice_bytes > len) /* can not use the thing, try to read more */
@@ -349,17 +379,34 @@ static int dispatch_slice(char *buf, size_t len, struct fec_header *h,
        if (!add_slice(buf, fg))
                return 1;
        if (group_complete(fg)) {
-               if (!pfd->fec) {
-                       int k = h->data_slices_per_group, n = h->slices_per_group;
-                       PARA_NOTICE_LOG("init fec (%d, %d)\n", k, n);
-                       ret = fec_new(k, n, &pfd->fec);
-                       if (ret < 0)
-                               return ret;
+               if (pfd->completion_status == GCS_NO_COMPLETE_GROUP) {
+                       pfd->completion_status = GCS_FIRST_GROUP_COMPLETE;
+                       pfd->first_complete_group = fg;
+                       return 1;
                }
+               assert(pfd->fec);
                ret = decode_group(fg, fn);
                if (ret < 0)
                        return ret;
+               return 1;
        }
+       if (pfd->completion_status == GCS_NO_COMPLETE_GROUP)
+               return 1;
+       if (pfd->completion_status == GCS_FIRST_GROUP_DECODED)
+               return 1;
+       if (fg == pfd->first_complete_group)
+               return 1;
+       assert(!pfd->fec);
+       k = h->data_slices_per_group;
+       n = h->slices_per_group;
+       PARA_NOTICE_LOG("init fec (%d, %d)\n", k, n);
+       ret = fec_new(k, n, &pfd->fec);
+       if (ret < 0)
+               return ret;
+       ret = decode_group(pfd->first_complete_group, fn);
+       if (ret < 0)
+               return ret;
+       pfd->completion_status = GCS_FIRST_GROUP_DECODED;
        return 1;
 }
 
@@ -371,7 +418,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;
@@ -399,9 +446,12 @@ static void fecdec_close(struct filter_node *fn)
 
 static void fecdec_open(struct filter_node *fn)
 {
+       struct private_fecdec_data *pfd;
        fn->bufsize = FECDEC_DEFAULT_OUTBUF_SIZE;
        fn->buf = para_malloc(fn->bufsize);
-       fn->private_data = para_calloc(sizeof(struct private_fecdec_data));
+       pfd = para_calloc(sizeof(*pfd));
+       pfd->completion_status = GCS_NO_COMPLETE_GROUP;
+       fn->private_data = pfd;
        fn->loaded = 0;
 }