diff options
| author | Alex Converse <alex.converse@gmail.com> | 2015-01-21 21:49:29 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2015-02-03 20:32:15 -0800 |
| commit | edd9ea3ffba1d5873dead1c57c74b1e3cc912167 (patch) | |
| tree | 30c9456b51bce87d3a0153ff4dbd9cb3dd000662 /libavcodec/aacdec.c | |
| parent | 82bd8a57692d8f3643ad0903c97e4a0f84393f53 (diff) | |
| download | ffmpeg-edd9ea3ffba1d5873dead1c57c74b1e3cc912167.tar.gz | |
aacdec: Refactor aac_er_decode_frame.
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 549e5e5cc6..90de2767d1 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2703,11 +2703,12 @@ static int aac_decode_er_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, GetBitContext *gb) { AACContext *ac = avctx->priv_data; + const MPEG4AudioConfig *const m4ac = &ac->oc[1].m4ac; ChannelElement *che; int err, i; int samples = 1024; - int chan_config = ac->oc[1].m4ac.chan_config; - int aot = ac->oc[1].m4ac.object_type; + int chan_config = m4ac->chan_config; + int aot = m4ac->object_type; if (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD) samples >>= 1; @@ -2719,13 +2720,13 @@ static int aac_decode_er_frame(AVCodecContext *avctx, void *data, // The FF_PROFILE_AAC_* defines are all object_type - 1 // This may lead to an undefined profile being signaled - ac->avctx->profile = ac->oc[1].m4ac.object_type - 1; + ac->avctx->profile = aot - 1; ac->tags_mapped = 0; if (chan_config < 0 || chan_config >= 8) { avpriv_request_sample(avctx, "Unknown ER channel configuration %d", - ac->oc[1].m4ac.chan_config); + chan_config); return AVERROR_INVALIDDATA; } for (i = 0; i < tags_per_config[chan_config]; i++) { |