summaryrefslogtreecommitdiffstats
path: root/audio/filter/af_pan.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_pan.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_pan.c')
-rw-r--r--audio/filter/af_pan.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/audio/filter/af_pan.c b/audio/filter/af_pan.c
index 3c15b8f629..cc6f129542 100644
--- a/audio/filter/af_pan.c
+++ b/audio/filter/af_pan.c
@@ -146,9 +146,6 @@ static int control(struct af_instance* af, int cmd, void* arg)
// Deallocate memory
static void uninit(struct af_instance* af)
{
- if(af->data)
- free(af->data->planes[0]);
- free(af->data);
free(af->setup);
}
@@ -165,8 +162,7 @@ static struct mp_audio* play(struct af_instance* af, struct mp_audio* data)
int ncho = l->nch; // Number of output channels
register int j,k;
- if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
- return NULL;
+ mp_audio_realloc_min(af->data, data->samples);
out = l->planes[0];
// Execute panning
@@ -196,9 +192,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_pan_t));
- if(af->data == NULL || af->setup == NULL)
+ if(af->setup == NULL)
return AF_ERROR;
return AF_OK;
}