From 54d0f5bc9aaeb43828caaecac0fd9b1e96a41a81 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 4 Feb 2016 12:28:54 +0100 Subject: af_lavrresample: change fudged channels Remove flc-frc <-> sl<->sr. This was just plain wrong, and a mistaken change to make 7.1 work properly on CoreAudio with 7.1(rear) layout. Also see the following commit. Add br-br <-> sl<->sr, because we decided that it makes sense. Note that this "fudging" is applied only if the channel pairs are replaced, i.e. they would get dropped and be replaced with silence. This is done to compensate for libswresample's default rematrixing (which takes care of some more common cases). --- audio/filter/af_lavrresample.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio') diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index 0c175a42e4..6fbb445563 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -180,8 +180,8 @@ bool af_lavrresample_test_conversion(int src_format, int dst_format) } static struct mp_chmap fudge_pairs[][2] = { - {MP_CHMAP2(FLC, FRC), MP_CHMAP2(SL, SR)}, - {MP_CHMAP2(SL, SR), MP_CHMAP2(FLC, FRC)}, + {MP_CHMAP2(BL, BR), MP_CHMAP2(SL, SR)}, + {MP_CHMAP2(SL, SR), MP_CHMAP2(BL, BR)}, {MP_CHMAP2(SDL, SDR), MP_CHMAP2(SL, SR)}, {MP_CHMAP2(SL, SR), MP_CHMAP2(SDL, SDR)}, }; -- cgit v1.2.3