/*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \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"
*/
#define NUM_FEC_GROUPS 3
-/** 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 {
/** Total number of slices in this group. */
uint16_t slice_bytes;
/** Non-zero if this group is the beginning of the stream. */
uint8_t bos;
- /** Non-zero if this stream embedds audio headers into fec groups. */
+ /** Non-zero if this stream embeds audio headers into fec groups. */
uint8_t header_stream;
};
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. */
{
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,
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);
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);
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",
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;
break;
if (sb + written > fg->h.audio_header_size)
n = fg->h.audio_header_size - written;
- if (fn->btrn)
- btr_copy(fg->data[i], n, pfd->btrp, fn->btrn);
- else
- memcpy(p + written, fg->data[i], n);
- fn->loaded += n;
+ 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++) {
size_t n = sb;
if (n + written > fg->h.group_bytes)
n = fg->h.group_bytes - written;
- if (fn->btrn)
- btr_copy(fg->data[i], n, pfd->btrp, fn->btrn);
- else
- memcpy(p + written, fg->data[i], n);
- fn->loaded += n;
+ btr_copy(fg->data[i], n, pfd->btrp, fn->btrn);
written += n;
}
- p += written;
return 0;
}
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", 128 * 1024);
/* decode and clear the first group */
ret = decode_group(pfd->first_complete_group, fn);
if (ret < 0)
FOR_EACH_FECDEC_GROUP(fg, pfd)
clear_group(fg);
- free(fn->buf);
- fn->buf = NULL;
fec_free(pfd->fec);
+ btr_pool_free(pfd->btrp);
free(fn->private_data);
fn->private_data = NULL;
- fn->conf = NULL;
}
-static void fecdec_post_select(__a_unused struct sched *s, struct task *t)
+static int fecdec_post_select(__a_unused struct sched *s, void *context)
{
- struct filter_node *fn = container_of(t, struct filter_node, task);
+ struct filter_node *fn = context;
struct btr_node *btrn = fn->btrn;
int ret;
struct fec_header h;
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)
{
struct private_fecdec_data *pfd;
- fn->bufsize = FECDEC_DEFAULT_OUTBUF_SIZE;
- fn->buf = para_malloc(fn->bufsize);
pfd = para_calloc(sizeof(*pfd));
fn->private_data = pfd;
- fn->loaded = 0;
fn->min_iqs = FEC_HEADER_SIZE;
}
projects / paraslash.git / blobdiff