aacdec: Support for ER AAC in LATM

0ee25733 · Niel van der Westhuizen · Alex Converse · edd9ea3f · 0ee25733
Commit 0ee25733 authored Jan 22, 2015 by Niel van der Westhuizen Committed by Alex Converse Feb 04, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

aacdec.c libavcodec/aacdec.c +11 -1

No files found.
--- 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;