diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 19:35:17 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 19:36:48 +0300 |
commit | 3fd3647fdc5b13348df299a70ada00d712ff84e4 (patch) | |
tree | 51dbe8c61330a845abed47a228e7250d31aa85b3 /libavcodec/libfdk-aacdec.c | |
parent | 93870f0a0b71328d4502d8f979481e42e3cb71b4 (diff) | |
parent | 2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e (diff) |
Merge commit '2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e'
* commit '2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e':
libfdk-aacdec: Make sure decoding doesn't add any extra delay in the latest version of fdk-aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacdec.c')
-rw-r--r-- | libavcodec/libfdk-aacdec.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index e66e6f93f6..a8ed104fc0 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -49,6 +49,7 @@ typedef struct FDKAACDecContext { int drc_boost; int drc_heavy; int drc_cut; + int level_limit; } FDKAACDecContext; @@ -71,6 +72,9 @@ static const AVOption fdk_aac_dec_options[] = { OFFSET(drc_level), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 127, AD, NULL }, { "drc_heavy", "Dynamic Range Control: heavy compression, where [1] is on (RF mode) and [0] is off", OFFSET(drc_heavy), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, AD, NULL }, +#ifdef AACDECODER_LIB_VL0 + { "level_limit", "Signal level limiting", OFFSET(level_limit), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, 1, AD }, +#endif { NULL } }; @@ -292,6 +296,13 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx) } } +#ifdef AACDECODER_LIB_VL0 + if (aacDecoder_SetParam(s->handle, AAC_PCM_LIMITER_ENABLE, s->level_limit) != AAC_DEC_OK) { + av_log(avctx, AV_LOG_ERROR, "Unable to set in signal level limiting in the decoder\n"); + return AVERROR_UNKNOWN; + } +#endif + avctx->sample_fmt = AV_SAMPLE_FMT_S16; return 0; |