From 1ed6e96cfba3c822d333f58c3181d18e0de95d14 Mon Sep 17 00:00:00 2001 From: ulion Date: Mon, 10 Dec 2007 16:53:30 +0000 Subject: 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 --- libmpcodecs/ae_lavc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'libmpcodecs/ae_lavc.c') diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index 8207496cb0..f8ba92ac56 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -14,6 +14,7 @@ #include "help_mp.h" #include "config.h" #include "libaf/af_format.h" +#include "libaf/reorder_ch.h" #ifdef USE_LIBAVCODEC_SO #include #else @@ -111,6 +112,16 @@ static int bind_lavc(audio_encoder_t *encoder, muxer_stream_t *mux_a) static int encode_lavc(audio_encoder_t *encoder, uint8_t *dest, void *src, int size, int max_size) { int n; + if ((encoder->params.channels == 6 || encoder->params.channels == 5) && + (!strcmp(lavc_acodec->name,"ac3") || + !strcmp(lavc_acodec->name,"libfaac"))) { + int isac3 = !strcmp(lavc_acodec->name,"ac3"); + reorder_channel_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + isac3 ? AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT + : AF_CHANNEL_LAYOUT_AAC_DEFAULT, + encoder->params.channels, + size / 2, 2); + } n = avcodec_encode_audio(lavc_actx, dest, size, src); compressed_frame_size = n; return n; -- cgit v1.2.3