diff mbox series

[FFmpeg-devel,1/2] libfdk-aacdec: Add an option for setting the decoder's DRC album mode

Message ID 20220119203837.9047-1-martin@martin.st
State Accepted
Commit 340a78afebad4bec205bbc83e077be9352887502
Headers show
Series [FFmpeg-devel,1/2] libfdk-aacdec: Add an option for setting the decoder's DRC album mode | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished

Commit Message

Martin Storsjö Jan. 19, 2022, 8:38 p.m. UTC 
---
 libavcodec/libfdk-aacdec.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
diff mbox series

Patch

diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index ffa1fdcce3..93b52023b0 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -56,6 +56,7 @@  typedef struct FDKAACDecContext {
     int drc_heavy;
     int drc_effect;
     int drc_cut;
+    int album_mode;
     int level_limit;
     int output_delay;
 } FDKAACDecContext;
@@ -87,6 +88,10 @@  static const AVOption fdk_aac_dec_options[] = {
 #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
+#if FDKDEC_VER_AT_LEAST(3, 1) // 3.1.0
+    { "album_mode","Dynamic Range Control: album mode, where [0] is off and [1] is on",
+                     OFFSET(album_mode),     AV_OPT_TYPE_INT,   { .i64 = -1},  -1, 1,   AD, NULL    },
 #endif
     { NULL }
 };
@@ -335,6 +340,15 @@  static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
     }
 #endif
 
+#if FDKDEC_VER_AT_LEAST(3, 1) // 3.1.0
+    if (s->album_mode != -1) {
+        if (aacDecoder_SetParam(s->handle, AAC_UNIDRC_ALBUM_MODE, s->album_mode) != AAC_DEC_OK) {
+            av_log(avctx, AV_LOG_ERROR, "Unable to set album mode in the decoder\n");
+            return AVERROR_UNKNOWN;
+        }
+    }
+#endif
+
     avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
     s->decoder_buffer_size = DECODER_BUFFSIZE * DECODER_MAX_CHANNELS;