xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-05 01:56:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libfdk-aacdec: Allow setting the new dynamic range control effect setting

Browse Source 
This is a new setting in FDK v2.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2018-09-04 11:36:37 +03:00
parent ffb9b7a6ba
commit 2edaafe5b9
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/libfdk-aacdec.c
View File

@ -51,6 +51,7 @@ typedef struct FDKAACDecContext {
int drc_level; int drc_level;
int drc_boost; int drc_boost;
int drc_heavy; int drc_heavy;
int drc_effect;
int drc_cut; int drc_cut;
int level_limit; int level_limit;
} FDKAACDecContext; } FDKAACDecContext;
@ -77,6 +78,10 @@ static const AVOption fdk_aac_dec_options[] = {
OFFSET(drc_heavy), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, AD, NULL }, OFFSET(drc_heavy), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, AD, NULL },
#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10 #if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
{ "level_limit", "Signal level limiting", OFFSET(level_limit), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, 1, AD }, { "level_limit", "Signal level limiting", OFFSET(level_limit), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, 1, AD },
#endif
#if FDKDEC_VER_AT_LEAST(3, 0) // 3.0.0
{ "drc_effect","Dynamic Range Control: effect type, where e.g. [0] is none and [6] is general",
OFFSET(drc_effect), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 8, AD, NULL },
#endif #endif
{ NULL } { NULL }
}; };
@ -306,6 +311,15 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
} }
#endif #endif
#if FDKDEC_VER_AT_LEAST(3, 0) // 3.0.0
if (s->drc_effect != -1) {
if (aacDecoder_SetParam(s->handle, AAC_UNIDRC_SET_EFFECT, s->drc_effect) != AAC_DEC_OK) {
av_log(avctx, AV_LOG_ERROR, "Unable to set DRC effect type in the decoder\n");
return AVERROR_UNKNOWN;
}
}
#endif
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;
s->decoder_buffer_size = DECODER_BUFFSIZE * DECODER_MAX_CHANNELS; s->decoder_buffer_size = DECODER_BUFFSIZE * DECODER_MAX_CHANNELS;