summaryrefslogtreecommitdiffstats
path: root/audio/filter/af.c
diff options
context:
space:
mode:
Diffstat (limited to 'audio/filter/af.c')
-rw-r--r--audio/filter/af.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/audio/filter/af.c b/audio/filter/af.c
index 71f4c67b51..ad43e5fca7 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -28,7 +28,6 @@ extern struct af_info af_info_dummy;
extern struct af_info af_info_delay;
extern struct af_info af_info_channels;
extern struct af_info af_info_format;
-extern struct af_info af_info_resample;
extern struct af_info af_info_volume;
extern struct af_info af_info_equalizer;
extern struct af_info af_info_pan;
@@ -38,7 +37,7 @@ extern struct af_info af_info_export;
extern struct af_info af_info_drc;
extern struct af_info af_info_extrastereo;
extern struct af_info af_info_lavcac3enc;
-extern struct af_info af_info_lavcresample;
+extern struct af_info af_info_lavrresample;
extern struct af_info af_info_sweep;
extern struct af_info af_info_hrtf;
extern struct af_info af_info_ladspa;
@@ -53,7 +52,6 @@ static struct af_info* filter_list[]={
&af_info_delay,
&af_info_channels,
&af_info_format,
- &af_info_resample,
&af_info_volume,
&af_info_equalizer,
&af_info_pan,
@@ -65,7 +63,7 @@ static struct af_info* filter_list[]={
&af_info_drc,
&af_info_extrastereo,
&af_info_lavcac3enc,
- &af_info_lavcresample,
+ &af_info_lavrresample,
&af_info_sweep,
&af_info_hrtf,
#ifdef CONFIG_LADSPA
@@ -527,9 +525,7 @@ int af_init(struct af_stream* s)
af = af_control_any_rev(s, AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET,
&(s->output.rate));
if (!af) {
- char *resampler = "resample";
- if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW)
- resampler = "lavcresample";
+ char *resampler = "lavrresample";
if((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW){
if(!strcmp(s->first->info->name,"format"))
af = af_append(s,s->first,resampler);
@@ -546,16 +542,6 @@ int af_init(struct af_stream* s)
if(!af || (AF_OK != af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET,
&(s->output.rate))))
return -1;
- // Use lin int if the user wants fast
- if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) {
- char args[32];
- sprintf(args, "%d", s->output.rate);
- if (strcmp(resampler, "lavcresample") == 0)
- strcat(args, ":1");
- else
- strcat(args, ":0:0");
- af->control(af, AF_CONTROL_COMMAND_LINE, args);
- }
}
if(AF_OK != af_reinit(s,af))
return -1;