MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow parsing and decoding of ADTS AAC files with channel config = 0

Browse Source 
Originally committed as revision 18815 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2009-05-13 17:57:58 +00:00
parent ee373ddffd
commit 90350d73f8
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/aac.c
View File

@ -162,9 +162,6 @@ static int output_configure(AACContext *ac, enum ChannelPosition che_pos[4][MAX_
AVCodecContext *avctx = ac->avccontext;
int i, type, channels = 0;
if(!memcmp(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])))
return 0; /* no change */
memcpy(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]));
/* Allocate or free elements depending on if they are in the
@ -458,9 +455,6 @@ static av_cold int aac_decode_init(AVCodecContext * avccontext) {
if(output_configure(ac, ac->che_pos, new_che_pos, 1))
return -1;
ac->m4ac.sample_rate = avccontext->sample_rate;
} else {
ff_log_missing_feature(ac->avccontext, "Implicit channel configuration is", 0);
return -1;
}
avccontext->sample_fmt = SAMPLE_FMT_S16;

2
libavcodec/aac_ac3_parser.c
View File

@ -84,8 +84,10 @@ get_next:
avctx->codec_id == CODEC_ID_EAC3)))) {
avctx->channels = avctx->request_channels;
} else {
if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
avctx->channels = s->channels;
avctx->channel_layout = s->channel_layout;
}
}
avctx->bit_rate = s->bit_rate;
avctx->frame_size = s->samples;

3
libavcodec/aac_parser.c
View File

@ -44,9 +44,6 @@ int ff_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr)
skip_bits1(gbc); /* private_bit */
ch = get_bits(gbc, 3); /* channel_configuration */
if(!ff_mpeg4audio_channels[ch])
return AAC_AC3_PARSE_ERROR_CHANNEL_CFG;
skip_bits1(gbc); /* original/copy */
skip_bits1(gbc); /* home */