diff options
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_dmo.c | 8 | ||||
-rw-r--r-- | libmpcodecs/ad_faad.c | 9 | ||||
-rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 20 | ||||
-rw-r--r-- | libmpcodecs/ad_pcm.c | 7 | ||||
-rw-r--r-- | libmpcodecs/ae_faac.c | 7 | ||||
-rw-r--r-- | libmpcodecs/ae_lavc.c | 11 | ||||
-rw-r--r-- | libmpcodecs/ae_pcm.c | 9 |
7 files changed, 71 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; } diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 506dc51348..039cdc15e1 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -10,6 +10,7 @@ #include "config.h" #include "ad_internal.h" +#include "libaf/reorder_ch.h" static ad_info_t info = { @@ -277,6 +278,14 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) /* XXX: samples already multiplied by channels! */ mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%ld Bytes)!\n", sh->samplesize*faac_finfo.samples); + + if (sh->channels >= 5) + reorder_channel_copy_nch(faac_sample_buffer, + AF_CHANNEL_LAYOUT_AAC_DEFAULT, + buf+len, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + sh->channels, + faac_finfo.samples, sh->samplesize); + else memcpy(buf+len,faac_sample_buffer, sh->samplesize*faac_finfo.samples); last_dec_len = sh->samplesize*faac_finfo.samples; len += last_dec_len; diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 8061eab410..472323a5de 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -7,6 +7,7 @@ #include "help_mp.h" #include "ad_internal.h" +#include "libaf/reorder_ch.h" #include "mpbswap.h" @@ -166,6 +167,25 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } if(y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) if(len2>0){ + if (((AVCodecContext *)sh_audio->context)->channels >= 5) { + int src_ch_layout = AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT; + const char *codec=((AVCodecContext*)sh_audio->context)->codec->name; + if (!strcasecmp(codec, "ac3")) + src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT; + else if (!strcasecmp(codec, "dca")) + src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_DCA_DEFAULT; + else if (!strcasecmp(codec, "libfaad") + || !strcasecmp(codec, "mpeg4aac")) + src_ch_layout = AF_CHANNEL_LAYOUT_AAC_DEFAULT; + else if (!strcasecmp(codec, "liba52")) + src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_LIBA52_DEFAULT; + else + src_ch_layout = AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT; + reorder_channel_nch(buf, src_ch_layout, + AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + ((AVCodecContext *)sh_audio->context)->channels, + len2 / 2, 2); + } //len=len2;break; if(len<0) len=len2; else len+=len2; buf+=len2; diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c index 30f36eec21..1717cdd75d 100644 --- a/libmpcodecs/ad_pcm.c +++ b/libmpcodecs/ad_pcm.c @@ -5,6 +5,7 @@ #include "config.h" #include "ad_internal.h" #include "libaf/af_format.h" +#include "libaf/reorder_ch.h" static ad_info_t info = { @@ -126,5 +127,11 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m // based on channels in preinit() return -1; len=demux_read_data(sh_audio->ds,buf,len); + if (len > 0 && sh_audio->channels >= 5) { + reorder_channel_nch(buf, AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT, + AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + sh_audio->channels, + len / sh_audio->samplesize, sh_audio->samplesize); + } return len; } diff --git a/libmpcodecs/ae_faac.c b/libmpcodecs/ae_faac.c index 891aea1fb9..86ada0ebfb 100644 --- a/libmpcodecs/ae_faac.c +++ b/libmpcodecs/ae_faac.c @@ -8,6 +8,7 @@ #include "mp_msg.h" #include "libmpdemux/aviheader.h" #include "libaf/af_format.h" +#include "libaf/reorder_ch.h" #include "libmpdemux/ms_hdr.h" #include "stream/stream.h" #include "libmpdemux/muxer.h" @@ -98,6 +99,12 @@ static int get_frame_size(audio_encoder_t *encoder) static int encode_faac(audio_encoder_t *encoder, uint8_t *dest, void *src, int len, int max_size) { + if (encoder->params.channels >= 5) + reorder_channel_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + AF_CHANNEL_LAYOUT_AAC_DEFAULT, + encoder->params.channels, + len / divisor, divisor); + // len is divided by the number of bytes per sample enc_frame_size = faacEncEncode(faac, (int32_t*) src, len / divisor, dest, max_size); 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 <ffmpeg/avcodec.h> #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; diff --git a/libmpcodecs/ae_pcm.c b/libmpcodecs/ae_pcm.c index f8d3ababf9..2fcc5e32e0 100644 --- a/libmpcodecs/ae_pcm.c +++ b/libmpcodecs/ae_pcm.c @@ -8,6 +8,7 @@ #include "mp_msg.h" #include "libmpdemux/aviheader.h" #include "libaf/af_format.h" +#include "libaf/reorder_ch.h" #include "libmpdemux/ms_hdr.h" #include "stream/stream.h" #include "libmpdemux/muxer.h" @@ -38,6 +39,14 @@ static int bind_pcm(audio_encoder_t *encoder, muxer_stream_t *mux_a) static int encode_pcm(audio_encoder_t *encoder, uint8_t *dest, void *src, int nsamples, int max_size) { max_size = FFMIN(nsamples, max_size); + if (encoder->params.channels == 6 || encoder->params.channels == 5) { + max_size -= max_size % (encoder->params.channels * 2); + reorder_channel_copy_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + dest, AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT, + encoder->params.channels, + max_size / 2, 2); + } + else memcpy(dest, src, max_size); return max_size; } |