sched: Kill old ->post_select variant.

[paraslash.git] / fecdec_filter.c

diff --git a/fecdec_filter.c b/fecdec_filter.c
index 10f1c642034c9457af12e6c23a1450bbf5eb3245..f1bd88595e3752397407c7afb8c4babe7f03baad 100644 (file)
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,9 +7,7 @@
 /** \file fecdec_filter.c A filter that fec-decodes an audio stream. */
 
 #include <regex.h>
-#include <stdbool.h>
 
-#include <dirent.h>
 #include "para.h"
 #include "error.h"
 #include "list.h"
@@ -61,6 +59,8 @@ struct fecdec_group {
        struct fec_header h;
        /** How many slices received so far. */
        int num_received_slices;
+       /** Bitmap of received slices. */
+       uint8_t received_slices[32];
        /** The size of the \a idx and the \a data arrays below. */
        int num_slices;
        /** Array of indices of the received slices. */
@@ -102,18 +102,11 @@ static void clear_group(struct fecdec_group *fg)
 {
        int i;
 
-       for (i = 0; i < fg->num_slices; i++) {
+       for (i = 0; i < fg->num_slices; i++)
                free(fg->data[i]);
-               fg->data[i] = NULL;
-               fg->idx[i] = -1;
-       }
        free(fg->data);
-       fg->data = NULL;
        free(fg->idx);
-       fg->idx = NULL;
-       fg->num_slices = 0;
-       memset(&fg->h, 0, sizeof(struct fec_header));
-       fg->num_received_slices = 0;
+       memset(fg, 0, sizeof(*fg));
 }
 
 static int find_group(struct fec_header *h,
@@ -213,29 +206,40 @@ success:
        return ret;
 }
 
+static bool test_and_set_slice_bit(struct fecdec_group *fg, uint8_t slice_num)
+{
+       uint8_t *p = fg->received_slices + slice_num / 8, old = *p;
+
+       *p |= 1 << (slice_num % 8);
+       return old == *p;
+}
+
 /*
  * returns 1 if slice was added, zero otherwise (because the group was already
- * complete). In any case the number of received slices is being increased by
- * one.
+ * complete or a slice has been received twice).
  */
 static int add_slice(char *buf, struct fecdec_group *fg)
 {
-       int r, slice_num;
+       int r;
+       uint8_t slice_num = fg->h.slice_num;
 
        if (group_complete(fg)) {
                PARA_DEBUG_LOG("group %d complete, ignoring slice %d\n",
-                       fg->h.group_num, fg->h.slice_num);
-               fg->num_received_slices++;
+                       fg->h.group_num, slice_num);
                return 0;
        }
-       slice_num = fg->h.slice_num;
        if (fg->num_slices == 0) {
                fg->num_slices = fg->h.slices_per_group;
                fg->idx = para_malloc(fg->num_slices * sizeof(int));
-               fg->data = para_malloc(fg->num_slices * sizeof(unsigned char *));
-               memset(fg->data, 0, fg->num_slices * sizeof(unsigned char *));
+               fg->data = para_calloc(fg->num_slices * sizeof(unsigned char *));
        }
        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,
+                       slice_num);
+               return 0;
+       }
        fg->idx[r] = slice_num;
        fg->data[r] = para_malloc(fg->h.slice_bytes);
        memcpy(fg->data[r], buf, fg->h.slice_bytes);
@@ -286,7 +290,7 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
        size_t written, need;
        struct private_fecdec_data *pfd = fn->private_data;
        enum fec_group_usability u = group_is_usable(fg, pfd);
-       char *buf = NULL, *p;
+       char *buf = NULL;
 
        if (u == FEC_GROUP_UNUSABLE) {
                PARA_INFO_LOG("dropping unusable group %d\n", fg->h.group_num);
@@ -300,8 +304,7 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
        pfd->have_header = 1;
        i = 0;
        if (u == FEC_GROUP_USABLE_SKIP_HEADER) {
-               i = ROUND_UP(fg->h.audio_header_size, fg->h.slice_bytes)
-                       / fg->h.slice_bytes;
+               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",
@@ -311,7 +314,6 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
        if (need > btr_pool_unused(pfd->btrp))
                return -E_FECDEC_OVERRUN;
        btr_pool_get_buffer(pfd->btrp, &buf);
-       p = buf;
        if (u == FEC_GROUP_USABLE_WITH_HEADER) {
                PARA_INFO_LOG("writing audio file header\n");
                written = 0;
@@ -324,7 +326,6 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
                        btr_copy(fg->data[i], n, pfd->btrp, fn->btrn);
                        written += n;
                }
-               p += written;
        }
        written = 0;
        for (; i < fg->h.data_slices_per_group; i++) {
@@ -334,7 +335,6 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
                btr_copy(fg->data[i], n, pfd->btrp, fn->btrn);
                written += n;
        }
-       p += written;
        return 0;
 }
 
@@ -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", 20 * k *  h->slice_bytes);
+       pfd->btrp = btr_pool_new("fecdec", 64 * 1024);
        /* decode and clear the first group */
        ret = decode_group(pfd->first_complete_group, fn);
        if (ret < 0)
@@ -436,7 +436,7 @@ 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, struct task *t)
 {
        struct filter_node *fn = container_of(t, struct filter_node, task);
        struct btr_node *btrn = fn->btrn;
@@ -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)
@@ -491,5 +491,5 @@ void fecdec_filter_init(struct filter *f)
        f->close = fecdec_close;
        f->open = fecdec_open;
        f->pre_select = generic_filter_pre_select;
-       f->post_select = fecdec_post_select;
+       f->new_post_select = fecdec_post_select;
 }