From ce246296b3fe899ec370ee60f91219fb74cf4273 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 5 Sep 2014 20:49:24 +0200 Subject: af_hrtf: request required samplerate, instead of erroring out It seems hrtf works in 48khz only - and if that wasn't the input, the filter just exited with an error. Make it request the 48khz instead. The player will insert a resampling filter. Not sure why it wasn't done like this in the first place. --- audio/filter/af_hrtf.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/audio/filter/af_hrtf.c b/audio/filter/af_hrtf.c index 19605453e7..9ffda62448 100644 --- a/audio/filter/af_hrtf.c +++ b/audio/filter/af_hrtf.c @@ -292,14 +292,7 @@ static int control(struct af_instance *af, int cmd, void* arg) switch(cmd) { case AF_CONTROL_REINIT: - af->data->rate = ((struct mp_audio*)arg)->rate; - if(af->data->rate != 48000) { - // automatic samplerate adjustment in the filter chain - // is not yet supported. - MP_ERR(af, "ERROR: Sampling rate is not 48000 Hz (%d)!\n", - af->data->rate); - return AF_ERROR; - } + af->data->rate = 48000; mp_audio_set_channels_old(af->data, ((struct mp_audio*)arg)->nch); if(af->data->nch == 2) { /* 2 channel input */ -- cgit v1.2.3