projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
paraslash 0.7.3
[paraslash.git]
/
aacdec_filter.c
diff --git
a/aacdec_filter.c
b/aacdec_filter.c
index 26d5f652c5d8fbd21933290d55cf0296118b9a17..87a7900af3ee9b43e1a661d66cdd54d1625b0952 100644
(file)
--- a/
aacdec_filter.c
+++ b/
aacdec_filter.c
@@
-1,8
+1,4
@@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/*
* based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
* Ahead Software AG
/*
* based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
* Ahead Software AG
@@
-28,7
+24,7
@@
/**
* data specific to the aacdec filter
*
/**
* data specific to the aacdec filter
*
- * \sa
filter, filter_node
+ * \sa
\ref filter, \ref filter_node.
*/
struct private_aacdec_data {
/** the return value of aac_open */
*/
struct private_aacdec_data {
/** the return value of aac_open */
@@
-56,7
+52,7
@@
static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
static void aacdec_open(struct filter_node *fn)
{
NeAACDecConfigurationPtr c;
static void aacdec_open(struct filter_node *fn)
{
NeAACDecConfigurationPtr c;
- struct private_aacdec_data *padd =
para_c
alloc(sizeof(*padd));
+ struct private_aacdec_data *padd =
z
alloc(sizeof(*padd));
padd->handle = NeAACDecOpen();
c = NeAACDecGetCurrentConfiguration(padd->handle);
padd->handle = NeAACDecOpen();
c = NeAACDecGetCurrentConfiguration(padd->handle);
@@
-78,7
+74,7
@@
static void aacdec_close(struct filter_node *fn)
fn->private_data = NULL;
}
fn->private_data = NULL;
}
-static int aacdec_post_
select
(__a_unused struct sched *s, void *context)
+static int aacdec_post_
monitor
(__a_unused struct sched *s, void *context)
{
struct filter_node *fn = context;
struct btr_node *btrn = fn->btrn;
{
struct filter_node *fn = context;
struct btr_node *btrn = fn->btrn;
@@
-140,7
+136,7
@@
next_buffer:
consumed += frame_info.bytesconsumed;
if (!frame_info.samples)
goto success;
consumed += frame_info.bytesconsumed;
if (!frame_info.samples)
goto success;
- btrbuf =
para_malloc(2 *
frame_info.samples);
+ btrbuf =
arr_alloc(2,
frame_info.samples);
for (i = 0; i < frame_info.samples; i++) {
short sh = ((short *)outbuf)[i];
write_int16_host_endian(btrbuf + loaded, sh);
for (i = 0; i < frame_info.samples; i++) {
short sh = ((short *)outbuf)[i];
write_int16_host_endian(btrbuf + loaded, sh);
@@
-162,7
+158,7
@@
err:
const struct filter lsg_filter_cmd_com_aacdec_user_data = {
.open = aacdec_open,
.close = aacdec_close,
const struct filter lsg_filter_cmd_com_aacdec_user_data = {
.open = aacdec_open,
.close = aacdec_close,
- .pre_
select = generic_filter_pre_select
,
- .post_
select = aacdec_post_select
,
+ .pre_
monitor = generic_filter_pre_monitor
,
+ .post_
monitor = aacdec_post_monitor
,
.execute = aacdec_execute
};
.execute = aacdec_execute
};