[FFmpeg-cvslog] aacdec: Support for ER AAC in LATM

[Niel van der Westhuizen]

ffmpeg | branch: master | Niel van der Westhuizen <espes at pequalsnp.com> | Wed Jan 21 21:24:23 2015 -0800| [0ee2573347ecdb9cb5656001f7201d819eec16d8] | committer: Alex Converse

aacdec: Support for ER AAC in LATM

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ee2573347ecdb9cb5656001f7201d819eec16d8
---

 libavcodec/aacdec.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 90de276..80dc79d 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -3235,7 +3235,17 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out,
         return AVERROR_INVALIDDATA;
     }
 
-    if ((err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb)) < 0)
+    switch (latmctx->aac_ctx.oc[1].m4ac.object_type) {
+    case AOT_ER_AAC_LC:
+    case AOT_ER_AAC_LTP:
+    case AOT_ER_AAC_LD:
+    case AOT_ER_AAC_ELD:
+        err = aac_decode_er_frame(avctx, out, got_frame_ptr, &gb);
+        break;
+    default:
+        err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb);
+    }
+    if (err < 0)
         return err;
 
     return muxlength;