summaryrefslogtreecommitdiffstats
path: root/audio/filter/af_convert24.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-10 23:20:06 +0100
committerwm4 <wm4@nowhere>2013-11-12 23:27:03 +0100
commitd115fb3b0eed9145817a20bc0070590f7428bddd (patch)
tree00aab1420c5ab64f77b777214b92ba51793ea589 /audio/filter/af_convert24.c
parente763d528e2b9370521b1e28450f48e65af33ca7f (diff)
downloadmpv-d115fb3b0eed9145817a20bc0070590f7428bddd.tar.bz2
mpv-d115fb3b0eed9145817a20bc0070590f7428bddd.tar.xz
af: don't require filters to allocate af_instance->data, redo buffers
Allocate af_instance->data in generic code before filter initialization. Every filter needs af->data (since it contains the output configuration), so there's no reason why every filter should allocate and free it. Remove RESIZE_LOCAL_BUFFER(), and replace it with mp_audio_realloc_min(). Interestingly, most code becomes simpler, because the new function takes the size in samples, and not in bytes. There are larger change in af_scaletempo.c and af_lavcac3enc.c, because these had copied and modified versions of the RESIZE_LOCAL_BUFFER macro/function.
Diffstat (limited to 'audio/filter/af_convert24.c')
-rw-r--r--audio/filter/af_convert24.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/audio/filter/af_convert24.c b/audio/filter/af_convert24.c
index 96924de344..19904cc8e7 100644
--- a/audio/filter/af_convert24.c
+++ b/audio/filter/af_convert24.c
@@ -74,8 +74,7 @@ static int control(struct af_instance *af, int cmd, void *arg)
static struct mp_audio *play(struct af_instance *af, struct mp_audio *data)
{
- if (RESIZE_LOCAL_BUFFER(af, data) != AF_OK)
- return NULL;
+ mp_audio_realloc_min(af->data, data->samples);
struct mp_audio *out = af->data;
size_t len = mp_audio_psize(data) / data->bps;
@@ -104,18 +103,10 @@ static struct mp_audio *play(struct af_instance *af, struct mp_audio *data)
return data;
}
-static void uninit(struct af_instance* af)
-{
- if (af->data)
- free(af->data->planes[0]);
-}
-
static int af_open(struct af_instance *af)
{
af->control = control;
af->play = play;
- af->uninit = uninit;
- af->data = talloc_zero(af, struct mp_audio);
return AF_OK;
}