/*
- * 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.
*/
/** \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"
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;
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++) {
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", 64 * 1024);
/* decode and clear the first group */
ret = decode_group(pfd->first_complete_group, fn);
if (ret < 0)
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;
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)