Browse Source

aacdec: Support for ER AAC in LATM

tags/n2.6
Niel van der Westhuizen Alex Converse 11 years ago
parent
commit
0ee2573347
1 changed files with 11 additions and 1 deletions
  1. +11
    -1
      libavcodec/aacdec.c

+ 11
- 1
libavcodec/aacdec.c View File

@@ -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;


Loading…
Cancel
Save