Fix all current known multi-channel wrong order problems by adding

common functions for channel reordering.
This fixes these modules by adding channel reordering code for 5.0/5.1 audio:
ao: pcm
ad: dmo, faad, ffmpeg(ac3, dca, libfaad, liba52), pcm
ae: faac, lavc(ac3, libfaac), pcm


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25343 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 8 insertions, 0 deletions

diff --git a/libmpcodecs/ad_dmo.c b/libmpcodecs/ad_dmo.c
index 33171c684e..d1133667c3 100644
--- a/libmpcodecs/ad_dmo.c
+++ b/libmpcodecs/ad_dmo.c
@@ -7,6 +7,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
+#include "libaf/reorder_ch.h"
 
 static ad_info_t info = 
 {
@@ -94,6 +95,13 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
           sh_audio->a_in_buffer_len-=size_in;
           memmove(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len);
         }
+        if (size_out > 0 && sh_audio->channels >= 5) {
+          reorder_channel_nch(buf, AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT,
+                              AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT,
+                              sh_audio->channels,
+                              size_out / sh_audio->samplesize,
+                              sh_audio->samplesize);
+        }
 //        len=size_out;
   return size_out;
 }