generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/aacdec: Skip processing channel elements which have not been present

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-09 04:25:12 +01:00
parent f9fa560597
commit 55d592f7d9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/aac.h
View File

@ -245,6 +245,7 @@ typedef struct SingleChannelElement {
* channel element - generic struct for SCE/CPE/CCE/LFE * channel element - generic struct for SCE/CPE/CCE/LFE
*/ */
typedef struct ChannelElement { typedef struct ChannelElement {
int present;
// CPE specific // CPE specific
int common_window; ///< Set if channels share a common 'IndividualChannelStream' in bitstream. int common_window; ///< Set if channels share a common 'IndividualChannelStream' in bitstream.
int ms_mode; ///< Signals mid/side stereo flags coding mode (used by encoder) int ms_mode; ///< Signals mid/side stereo flags coding mode (used by encoder)

7
libavcodec/aacdec.c
View File

@ -2744,7 +2744,7 @@ static void spectral_to_sample(AACContext *ac)
for (type = 3; type >= 0; type--) { for (type = 3; type >= 0; type--) {
for (i = 0; i < MAX_ELEM_ID; i++) { for (i = 0; i < MAX_ELEM_ID; i++) {
ChannelElement *che = ac->che[type][i]; ChannelElement *che = ac->che[type][i];
if (che) { if (che && che->present) {
if (type <= TYPE_CPE) if (type <= TYPE_CPE)
apply_channel_coupling(ac, che, type, i, BEFORE_TNS, apply_dependent_coupling); apply_channel_coupling(ac, che, type, i, BEFORE_TNS, apply_dependent_coupling);
if (ac->oc[1].m4ac.object_type == AOT_AAC_LTP) { if (ac->oc[1].m4ac.object_type == AOT_AAC_LTP) {
@ -2776,6 +2776,9 @@ static void spectral_to_sample(AACContext *ac)
} }
if (type <= TYPE_CCE) if (type <= TYPE_CCE)
apply_channel_coupling(ac, che, type, i, AFTER_IMDCT, apply_independent_coupling); apply_channel_coupling(ac, che, type, i, AFTER_IMDCT, apply_independent_coupling);
che->present = 0;
} else if (che) {
av_log(ac->avctx, AV_LOG_WARNING, "ChannelElement %d.%d missing \n", type, i);
} }
} }
} }
@ -2880,6 +2883,7 @@ static int aac_decode_er_frame(AVCodecContext *avctx, void *data,
elem_type, elem_id); elem_type, elem_id);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
che->present = 1;
if (aot != AOT_ER_AAC_ELD) if (aot != AOT_ER_AAC_ELD)
skip_bits(gb, 4); skip_bits(gb, 4);
switch (elem_type) { switch (elem_type) {
@ -2954,6 +2958,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
goto fail; goto fail;
} }
samples = 1024; samples = 1024;
che->present = 1;
} }
switch (elem_type) { switch (elem_type) {