virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

aacdec: Turn off PS for multichannel files that use PCE based configs.

Browse Source 
Fixes al_sbr_cm_48_5.1.mp4.
This commit is contained in:
Alex Converse 2012-01-06 17:22:45 -08:00
parent 1ef8ff4534
commit 4acd43a295
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/aac.h
View File

@ -84,6 +84,7 @@ enum BandType {
#define IS_CODEBOOK_UNSIGNED(x) ((x - 1) & 10) #define IS_CODEBOOK_UNSIGNED(x) ((x - 1) & 10)
enum ChannelPosition { enum ChannelPosition {
AAC_CHANNEL_OFF = 0,
AAC_CHANNEL_FRONT = 1, AAC_CHANNEL_FRONT = 1,
AAC_CHANNEL_SIDE = 2, AAC_CHANNEL_SIDE = 2,
AAC_CHANNEL_BACK = 3, AAC_CHANNEL_BACK = 3,

21
libavcodec/aacdec.c
View File

@ -163,6 +163,19 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
} }
} }
static int count_channels(enum ChannelPosition che_pos[4][MAX_ELEM_ID])
{
int i, type, sum = 0;
for (i = 0; i < MAX_ELEM_ID; i++) {
for (type = 0; type < 4; type++) {
sum += (1 + (type == TYPE_CPE)) *
(che_pos[type][i] != AAC_CHANNEL_OFF &&
che_pos[type][i] != AAC_CHANNEL_CC);
}
}
return sum;
}
/** /**
* Check for the channel element in the current channel position configuration. * Check for the channel element in the current channel position configuration.
* If it exists, make sure the appropriate element is allocated and map the * If it exists, make sure the appropriate element is allocated and map the
@ -418,6 +431,12 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
if ((ret = set_default_channel_config(avctx, new_che_pos, channel_config))) if ((ret = set_default_channel_config(avctx, new_che_pos, channel_config)))
return ret; return ret;
} }
if (count_channels(new_che_pos) > 1) {
m4ac->ps = 0;
} else if (m4ac->sbr == 1 && m4ac->ps == -1)
m4ac->ps = 1;
if (ac && (ret = output_configure(ac, ac->che_pos, new_che_pos, channel_config, OC_GLOBAL_HDR))) if (ac && (ret = output_configure(ac, ac->che_pos, new_che_pos, channel_config, OC_GLOBAL_HDR)))
return ret; return ret;
@ -476,8 +495,6 @@ static int decode_audio_specific_config(AACContext *ac,
av_log(avctx, AV_LOG_ERROR, "invalid sampling rate index %d\n", m4ac->sampling_index); av_log(avctx, AV_LOG_ERROR, "invalid sampling rate index %d\n", m4ac->sampling_index);
return -1; return -1;
} }
if (m4ac->sbr == 1 && m4ac->ps == -1)
m4ac->ps = 1;
skip_bits_long(&gb, i); skip_bits_long(&gb, i);