audio/filters: use refcounted frames for some simple filters

These are read-only, and very trivial to convert.
This commit is contained in:
wm4 2015-01-13 20:16:02 +01:00
parent 772c42a95c
commit 1fde40732e
4 changed files with 18 additions and 10 deletions

View File

@ -41,15 +41,16 @@ static int control(struct af_instance* af, int cmd, void* arg)
}
// Filter data through filter
static int filter(struct af_instance* af, struct mp_audio* data, int flags)
static int filter(struct af_instance* af, struct mp_audio* data)
{
af_add_output_frame(af, data);
return 0;
}
// Allocate memory and set function pointers
static int af_open(struct af_instance* af){
af->control=control;
af->filter=filter;
af->filter_frame=filter;
return AF_OK;
}

View File

@ -162,8 +162,10 @@ static void uninit( struct af_instance* af )
af audio filter instance
data audio data
*/
static int filter( struct af_instance* af, struct mp_audio* data, int flags)
static int filter(struct af_instance *af, struct mp_audio *data)
{
if (!data)
return 0;
struct mp_audio* c = data; // Current working data
af_export_t* s = af->priv; // Setup for this instance
int16_t* a = c->planes[0]; // Incomming sound
@ -199,6 +201,7 @@ static int filter( struct af_instance* af, struct mp_audio* data, int flags)
&(s->count), sizeof(s->count));
}
af_add_output_frame(af, data);
return 0;
}
@ -210,7 +213,7 @@ static int af_open( struct af_instance* af )
{
af->control = control;
af->uninit = uninit;
af->filter = filter;
af->filter_frame = filter;
af_export_t *priv = af->priv;
if (!priv->filename || !priv->filename[0]) {

View File

@ -44,9 +44,11 @@ static int control(struct af_instance *af, int cmd, void *arg)
return AF_UNKNOWN;
}
static int filter(struct af_instance *af, struct mp_audio *data, int flags)
static int filter(struct af_instance *af, struct mp_audio *data)
{
mp_audio_copy_config(data, af->data);
if (data)
mp_audio_copy_config(data, af->data);
af_add_output_frame(af, data);
return 0;
}
@ -54,7 +56,7 @@ static int af_open(struct af_instance *af)
{
struct priv *priv = af->priv;
af->control = control;
af->filter = filter;
af->filter_frame = filter;
priv->speed = 1.0;
return AF_OK;
}

View File

@ -95,16 +95,18 @@ static int control(struct af_instance *af, int cmd, void *arg)
return AF_UNKNOWN;
}
static int filter(struct af_instance *af, struct mp_audio *data, int flags)
static int filter(struct af_instance *af, struct mp_audio *data)
{
mp_audio_copy_config(data, af->data);
if (data)
mp_audio_copy_config(data, af->data);
af_add_output_frame(af, data);
return 0;
}
static int af_open(struct af_instance *af)
{
af->control = control;
af->filter = filter;
af->filter_frame = filter;
force_in_params(af, af->data);
force_out_params(af, af->data);