diff options
| author | mplayer-svn <svn@mplayerhq.hu> | 2012-04-24 21:01:15 +0000 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-03 03:34:38 +0200 |
| commit | 882f538efbf446e10b48264081f425cd4cafff9c (patch) | |
| tree | 3bb5d97611f38fca194c2b595c2f537d33bf7a8f | |
| parent | 97f0ed25ed9e50f61167e38414777525c5db063e (diff) | |
| download | mpv-882f538efbf446e10b48264081f425cd4cafff9c.tar.bz2 mpv-882f538efbf446e10b48264081f425cd4cafff9c.tar.xz | |
reorder_ch: support reordering 8 channels to AAC layout
This will allow us to encode 7.1 audio AAC.
7.1 audio not being really popular, instead of creating a new re_order
function, I'm using 2 functions for the re_ordering from
L R Ls Rs C LFE Rls Rrs --> C L R Ls Rs Rls Rrs LFE
Patch by Thierry Foucu [tfoucu gmail]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34877 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: ranma
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2012-April/070252.html
| -rw-r--r-- | libaf/reorder_ch.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/libaf/reorder_ch.c b/libaf/reorder_ch.c index 5a6a1d9d93..d1d7e8de63 100644 --- a/libaf/reorder_ch.c +++ b/libaf/reorder_ch.c @@ -785,6 +785,9 @@ static int reorder_self_5_step_1(void *src, unsigned int samples, if (chnum==6) { REORDER_SELF_SWAP_5_STEP_1(src_8,tmp,samples,6,s0,s1,s2,s3,s4); } + else if (chnum==8) { + REORDER_SELF_SWAP_5_STEP_1(src_8,tmp,samples,8,s0,s1,s2,s3,s4); + } else { REORDER_SELF_SWAP_5_STEP_1(src_8,tmp,samples,5,s0,s1,s2,s3,s4); } @@ -797,6 +800,9 @@ static int reorder_self_5_step_1(void *src, unsigned int samples, if (chnum==6) { REORDER_SELF_SWAP_5_STEP_1(src_16,tmp,samples,6,s0,s1,s2,s3,s4); } + else if (chnum==8) { + REORDER_SELF_SWAP_5_STEP_1(src_16,tmp,samples,8,s0,s1,s2,s3,s4); + } else { REORDER_SELF_SWAP_5_STEP_1(src_16,tmp,samples,5,s0,s1,s2,s3,s4); } @@ -835,6 +841,9 @@ static int reorder_self_5_step_1(void *src, unsigned int samples, if (chnum==6) { REORDER_SELF_SWAP_5_STEP_1(src_32,tmp,samples,6,s0,s1,s2,s3,s4); } + else if (chnum==8) { + REORDER_SELF_SWAP_5_STEP_1(src_32,tmp,samples,8,s0,s1,s2,s3,s4); + } else { REORDER_SELF_SWAP_5_STEP_1(src_32,tmp,samples,5,s0,s1,s2,s3,s4); } @@ -847,6 +856,9 @@ static int reorder_self_5_step_1(void *src, unsigned int samples, if (chnum==6) { REORDER_SELF_SWAP_5_STEP_1(src_64,tmp,samples,6,s0,s1,s2,s3,s4); } + else if (chnum==8) { + REORDER_SELF_SWAP_5_STEP_1(src_64,tmp,samples,8,s0,s1,s2,s3,s4); + } else { REORDER_SELF_SWAP_5_STEP_1(src_64,tmp,samples,5,s0,s1,s2,s3,s4); } @@ -1250,6 +1262,7 @@ void reorder_channel(void *src, // AF_CHANNEL_LAYOUT_7_1_A L R C LFE Ls Rs Rls Rrs // AF_CHANNEL_LAYOUT_7_1_B L R Ls Rs C LFE Rls Rrs // AF_CHANNEL_LAYOUT_7_1_C L C R Ls Rs LFE Rls Rrs + // AF_CHANNEL_LAYOUT_7_1_D C L R Ls Rs Rls Rrs LFE // AF_CHANNEL_LAYOUT_7_1_F C L R LFE Ls Rs Rls Rrs case AF_CHANNEL_LAYOUT_7_1_A << 16 | AF_CHANNEL_LAYOUT_7_1_B: case AF_CHANNEL_LAYOUT_7_1_B << 16 | AF_CHANNEL_LAYOUT_7_1_A: @@ -1258,6 +1271,12 @@ void reorder_channel(void *src, else reorder_self_4_step_2(src, samples, samplesize, 8, 2, 3, 4, 5); break; + case AF_CHANNEL_LAYOUT_7_1_B << 16 | AF_CHANNEL_LAYOUT_7_1_D: + // First convert to AF_CHANNEL_LAYOUT_7_1_F + reorder_self_2_4(src, samples, samplesize, 8, 3, 5, 4, 2, 1, 0); + // then convert to AF_CHANNEL_LAYOUT_7_1_D + reorder_self_5_step_1(src, samples, samplesize, 8, 3, 4, 5, 6, 7); + break; case AF_CHANNEL_LAYOUT_7_1_C << 16 | AF_CHANNEL_LAYOUT_7_1_B: reorder_self_4_step_1(src, samples, samplesize, 8, 1, 2, 3, 4); break; |