diff options
author | wm4 <wm4@nowhere> | 2013-11-10 23:20:06 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-12 23:27:03 +0100 |
commit | d115fb3b0eed9145817a20bc0070590f7428bddd (patch) | |
tree | 00aab1420c5ab64f77b777214b92ba51793ea589 /audio/filter/af_channels.c | |
parent | e763d528e2b9370521b1e28450f48e65af33ca7f (diff) | |
download | mpv-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_channels.c')
-rw-r--r-- | audio/filter/af_channels.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/audio/filter/af_channels.c b/audio/filter/af_channels.c index fd3b8262f5..7e05a9e234 100644 --- a/audio/filter/af_channels.c +++ b/audio/filter/af_channels.c @@ -222,9 +222,6 @@ static int control(struct af_instance* af, int cmd, void* arg) static void uninit(struct af_instance* af) { free(af->setup); - if (af->data) - free(af->data->planes[0]); - free(af->data); } // Filter data through filter @@ -235,8 +232,7 @@ static struct mp_audio* play(struct af_instance* af, struct mp_audio* data) af_channels_t* s = af->setup; int i; - if(AF_OK != RESIZE_LOCAL_BUFFER(af,data)) - return NULL; + mp_audio_realloc_min(af->data, data->samples); // Reset unused channels memset(l->planes[0],0,mp_audio_psize(c) / c->nch * l->nch); @@ -260,9 +256,8 @@ static int af_open(struct af_instance* af){ af->uninit=uninit; af->play=play; af->mul=1; - af->data=calloc(1,sizeof(struct mp_audio)); af->setup=calloc(1,sizeof(af_channels_t)); - if((af->data == NULL) || (af->setup == NULL)) + if(af->setup == NULL) return AF_ERROR; return AF_OK; } |