RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix multi-channel AAC encoding. 

Fixes ticket 55.
This commit is contained in:
Carl Eugen Hoyos 2011-06-15 10:57:26 +02:00
parent b1c450be49
commit b3452771c4
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/aacenc.c
View File

@ -135,6 +135,15 @@ static const uint8_t aac_chan_configs[6][5] = {
{4, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_LFE}, // 6 channels - front center + stereo + back stereo + LFE {4, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_LFE}, // 6 channels - front center + stereo + back stereo + LFE
}; };
static const uint8_t channel_maps[][AAC_MAX_CHANNELS] = {
{ 0 },
{ 0, 1 },
{ 2, 0, 1 },
{ 2, 0, 1, 3 },
{ 2, 0, 1, 3, 4 },
{ 2, 0, 1, 4, 5, 3 },
};
/** /**
* Make AAC audio config object. * Make AAC audio config object.
* @see 1.6.2.1 "Syntax - AudioSpecificConfig" * @see 1.6.2.1 "Syntax - AudioSpecificConfig"
@ -499,15 +508,24 @@ static int aac_encode_frame(AVCodecContext *avctx,
return 0; return 0;
if (data) { if (data) {
if (!s->psypp) { if (!s->psypp) {
if (avctx->channels <= 2) {
memcpy(s->samples + 1024 * avctx->channels, data, memcpy(s->samples + 1024 * avctx->channels, data,
1024 * avctx->channels * sizeof(s->samples[0])); 1024 * avctx->channels * sizeof(s->samples[0]));
} else {
for (i = 0; i < 1024; i++)
for (ch = 0; ch < avctx->channels; ch++)
s->samples[(i + 1024) * avctx->channels + ch] =
((int16_t*)data)[i * avctx->channels +
channel_maps[avctx->channels-1][ch]];
}
} else { } else {
start_ch = 0; start_ch = 0;
samples2 = s->samples + 1024 * avctx->channels; samples2 = s->samples + 1024 * avctx->channels;
for (i = 0; i < chan_map[0]; i++) { for (i = 0; i < chan_map[0]; i++) {
tag = chan_map[i+1]; tag = chan_map[i+1];
chans = tag == TYPE_CPE ? 2 : 1; chans = tag == TYPE_CPE ? 2 : 1;
ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch, ff_psy_preprocess(s->psypp,
(uint16_t*)data + channel_maps[avctx->channels-1][start_ch],
samples2 + start_ch, start_ch, chans); samples2 + start_ch, start_ch, chans);
start_ch += chans; start_ch += chans;
} }

10
libavcodec/libfaac.c
View File

@ -31,6 +31,13 @@ typedef struct FaacAudioContext {
faacEncHandle faac_handle; faacEncHandle faac_handle;
} FaacAudioContext; } FaacAudioContext;
static const int channel_maps[][6] = {
{ 2, 0, 1 }, //< C L R
{ 2, 0, 1, 3 }, //< C L R Cs
{ 2, 0, 1, 3, 4 }, //< C L R Ls Rs
{ 2, 0, 1, 4, 5, 3 }, //< C L R Ls Rs LFE
};
static av_cold int Faac_encode_init(AVCodecContext *avctx) static av_cold int Faac_encode_init(AVCodecContext *avctx)
{ {
FaacAudioContext *s = avctx->priv_data; FaacAudioContext *s = avctx->priv_data;
@ -86,6 +93,9 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
} }
faac_cfg->outputFormat = 1; faac_cfg->outputFormat = 1;
faac_cfg->inputFormat = FAAC_INPUT_16BIT; faac_cfg->inputFormat = FAAC_INPUT_16BIT;
if (avctx->channels > 2)
memcpy(faac_cfg->channel_map, channel_maps[avctx->channels-3],
avctx->channels * sizeof(int));
avctx->frame_size = samples_input / avctx->channels; avctx->frame_size = samples_input / avctx->channels;