RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
ulion 2007-12-10 16:53:30 +00:00
parent 24dafeee09
commit 1ed6e96cfb
12 changed files with 1404 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/man/en/mplayer.1
View File

@ -4817,8 +4817,6 @@ Observe that if media containing two channels was played back, channels
Would change the number of channels to 6 and set up 4 routes
that copy channel 0 to channels 0 to 3.
Channel 4 and 5 will contain silence.
.IPs "mplayer \-af channels=6:6:0:4:1:0:2:1:3:2:4:3:5:5 media.avi"
Should make the 6-channel ffdca (DTS) output work correctly with ALSA.
.RE
.PD 1
.

1
libaf/Makefile
View File

@ -26,6 +26,7 @@ SRCS_COMMON = af.c \
af_volume.c \
filter.c \
format.c \
reorder_ch.c \
window.c \
$(AF_SRCS) \

1197
libaf/reorder_ch.c Normal file
View File

File diff suppressed because it is too large Load Diff

125
libaf/reorder_ch.h Normal file
View File

@ -0,0 +1,125 @@
/*
* common functions for reordering audio channels
*
* Copyright (C) 2007 Ulion <ulion A gmail P com>
*
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* MPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with MPlayer; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef REORDER_CH_H
#define REORDER_CH_H
// L - Left
// R - Right
// C - Center
// Ls - Left Surround
// Rs - Right Surround
// Cs - Center Surround
// Rls - Rear Left Surround
// Rrs - Rear Right Surround
#define AF_LFE (1<<7)
#define AF_CHANNEL_LAYOUT_MONO ((100<<8)|1)
#define AF_CHANNEL_LAYOUT_STEREO ((101<<8)|2)
#define AF_CHANNEL_LAYOUT_1_0 AF_CHANNEL_LAYOUT_MONO // C
#define AF_CHANNEL_LAYOUT_2_0 AF_CHANNEL_LAYOUT_STEREO // L R
#define AF_CHANNEL_LAYOUT_2_1 ((102<<8)|3) // L R LFE
#define AF_CHANNEL_LAYOUT_3_0_A ((103<<8)|3) // L R C
#define AF_CHANNEL_LAYOUT_3_0_B ((104<<8)|3) // C L R
#define AF_CHANNEL_LAYOUT_4_0_A ((105<<8)|4) // L R C Cs
#define AF_CHANNEL_LAYOUT_4_0_B ((106<<8)|4) // C L R Cs
#define AF_CHANNEL_LAYOUT_4_0_C ((107<<8)|4) // L R Ls Rs
#define AF_CHANNEL_LAYOUT_5_0_A ((108<<8)|5) // L R C Ls Rs
#define AF_CHANNEL_LAYOUT_5_0_B ((109<<8)|5) // L R Ls Rs C
#define AF_CHANNEL_LAYOUT_5_0_C ((110<<8)|5) // L C R Ls Rs
#define AF_CHANNEL_LAYOUT_5_0_D ((111<<8)|5) // C L R Ls Rs
#define AF_CHANNEL_LAYOUT_5_1_A ((112<<8)|6|AF_LFE) // L R C LFE Ls Rs
#define AF_CHANNEL_LAYOUT_5_1_B ((113<<8)|6|AF_LFE) // L R Ls Rs C LFE
#define AF_CHANNEL_LAYOUT_5_1_C ((114<<8)|6|AF_LFE) // L C R Ls Rs LFE
#define AF_CHANNEL_LAYOUT_5_1_D ((115<<8)|6|AF_LFE) // C L R Ls Rs LFE
#define AF_CHANNEL_LAYOUT_5_1_E ((116<<8)|6|AF_LFE) // LFE L C R Ls Rs
#define AF_CHANNEL_LAYOUT_6_1_A ((117<<8)|7|AF_LFE) // L R C LFE Ls Rs Cs
#define AF_CHANNEL_LAYOUT_7_1_A ((118<<8)|8|AF_LFE) // L R C LFE Ls Rs Rls Rrs
#define AF_CHANNEL_LAYOUT_ALSA_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_B
#define AF_CHANNEL_LAYOUT_ALSA_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_B
#define AF_CHANNEL_LAYOUT_MPLAYER_5CH_DEFAULT AF_CHANNEL_LAYOUT_ALSA_5CH_DEFAULT
#define AF_CHANNEL_LAYOUT_MPLAYER_6CH_DEFAULT AF_CHANNEL_LAYOUT_ALSA_6CH_DEFAULT
#define AF_CHANNEL_LAYOUT_AAC_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_D
#define AF_CHANNEL_LAYOUT_AAC_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_D
#define AF_CHANNEL_LAYOUT_WAVEEX_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_A
#define AF_CHANNEL_LAYOUT_WAVEEX_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_A
#define AF_CHANNEL_LAYOUT_LAVC_AC3_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_C
#define AF_CHANNEL_LAYOUT_LAVC_AC3_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_C
#define AF_CHANNEL_LAYOUT_LAVC_LIBA52_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_C
#define AF_CHANNEL_LAYOUT_LAVC_LIBA52_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_E
#define AF_CHANNEL_LAYOUT_LAVC_DCA_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_D
#define AF_CHANNEL_LAYOUT_LAVC_DCA_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_D
#define AF_CHANNEL_MASK 0xFF
#define AF_GET_CH_NUM(A) ((A)&0x7F)
#define AF_GET_CH_NUM_WITH_LFE(A) ((A)&0xFF)
#define AF_IS_SAME_CH_NUM(A,B) (((A)&0xFF)==((B)&0xFF))
#define AF_IS_LAYOUT_SPECIFIED(A) ((A)&0xFFFFF800)
#define AF_IS_LAYOUT_UNSPECIFIED(A) (!AF_IS_LAYOUT_SPECIFIED(A))
/// Optimized channel reorder between channel layouts with same channel number.
void reorder_channel_copy(void *src,
int src_layout,
void *dest,
int dest_layout,
int samples,
int samplesize);
/// Same with reorder_channel_copy, but works on single buffer.
void reorder_channel(void *buf,
int src_layout,
int dest_layout,
int samples,
int samplesize);
// Channel layout definitions for different audio sources or targets
// When specified channel number, they will be map to the specific layouts.
#define AF_CHANNEL_LAYOUT_ALSA_DEFAULT 0
#define AF_CHANNEL_LAYOUT_AAC_DEFAULT 1
#define AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT 2
#define AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT 3
#define AF_CHANNEL_LAYOUT_LAVC_LIBA52_DEFAULT 4
#define AF_CHANNEL_LAYOUT_LAVC_DCA_DEFAULT 5
#define AF_CHANNEL_LAYOUT_SOURCE_NUM 6
#define AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT AF_CHANNEL_LAYOUT_ALSA_DEFAULT
/// Optimized channel reorder between different audio sources and targets.
void reorder_channel_copy_nch(void *src,
int src_layout,
void *dest,
int dest_layout,
int chnum,
int samples,
int samplesize);
/// Same with reorder_channel_copy_nch, but works on single buffer.
void reorder_channel_nch(void *buf,
int src_layout,
int dest_layout,
int chnum,
int samples,
int samplesize);
#endif /* REORDER_CH_H */

10
libao2/ao_pcm.c
View File

@ -8,6 +8,7 @@
#include "mpbswap.h"
#include "subopt-helper.h"
#include "libaf/af_format.h"
#include "libaf/reorder_ch.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "mp_msg.h"
@ -200,6 +201,15 @@ static int play(void* data,int len,int flags){
}
#endif
if (ao_data.channels == 6 || ao_data.channels == 5) {
int frame_size = le2me_16(wavhdr.bits) / 8;
len -= len % (frame_size * ao_data.channels);
reorder_channel_nch(data, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT,
AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT,
ao_data.channels,
len / frame_size, frame_size);
}
//printf("PCM: Writing chunk!\n");
fwrite(data,len,1,fp);

8
libmpcodecs/ad_dmo.c
View File

@ -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;
}

9
libmpcodecs/ad_faad.c
View File

@ -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;

20
libmpcodecs/ad_ffmpeg.c
View File

@ -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;

7
libmpcodecs/ad_pcm.c
View File

@ -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;
}

7
libmpcodecs/ae_faac.c
View File

@ -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);

11
libmpcodecs/ae_lavc.c
View File

@ -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;

9
libmpcodecs/ae_pcm.c
View File

@ -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;
}