summaryrefslogtreecommitdiffstats
path: root/audio/filter/af_hrtf.c
diff options
context:
space:
mode:
Diffstat (limited to 'audio/filter/af_hrtf.c')
-rw-r--r--audio/filter/af_hrtf.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/audio/filter/af_hrtf.c b/audio/filter/af_hrtf.c
index 1e3244e2eb..85e6477b31 100644
--- a/audio/filter/af_hrtf.c
+++ b/audio/filter/af_hrtf.c
@@ -31,8 +31,6 @@
#include "af.h"
#include "dsp.h"
-#include "audio/reorder_ch.h"
-
/* HRTF filter coefficients and adjustable parameters */
#include "af_hrtf.h"
@@ -301,7 +299,7 @@ static int control(struct af_instance *af, int cmd, void* arg)
af->data->rate);
return AF_ERROR;
}
- mp_audio_set_num_channels(af->data, ((struct mp_audio*)arg)->nch);
+ mp_audio_set_channels_old(af->data, ((struct mp_audio*)arg)->nch);
if(af->data->nch == 2) {
/* 2 channel input */
if(s->decode_mode != HRTF_MIX_MATRIX2CH) {
@@ -310,7 +308,7 @@ static int control(struct af_instance *af, int cmd, void* arg)
}
}
else if (af->data->nch < 5)
- mp_audio_set_num_channels(af->data, 5);
+ mp_audio_set_channels_old(af->data, 5);
mp_audio_set_format(af->data, AF_FORMAT_S16_NE);
test_output_res = af_test_output(af, (struct mp_audio*)arg);
af->mul = 2.0 / af->data->nch;
@@ -391,12 +389,6 @@ static struct mp_audio* play(struct af_instance *af, struct mp_audio *data)
float common, left, right, diff, left_b, right_b;
const int dblen = s->dlbuflen, hlen = s->hrflen, blen = s->basslen;
- // This was written against the old mplayer channel order, which was ALSA.
- // Feel free to fix the otuput code below to output proper order.
- reorder_channel_nch(data->audio, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT,
- AF_CHANNEL_LAYOUT_ALSA_DEFAULT,
- data->nch, data->len / data->bps, data->bps);
-
if(AF_OK != RESIZE_LOCAL_BUFFER(af, data))
return NULL;