From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5C7A24321D for ; Wed, 19 Jan 2022 20:38:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B47068B17C; Wed, 19 Jan 2022 22:38:45 +0200 (EET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A7B768AF54 for ; Wed, 19 Jan 2022 22:38:39 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id n8so7559794wmk.3 for ; Wed, 19 Jan 2022 12:38:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/euBZgy5QU+9XHqilJN2KbYUz9s2i4GKNn2XA1JE5cI=; b=Ep63uGiqVqSIek+OfVSvoDTtPegIVC5gcVpP2qena0/6nxJjY9a6Yg6Rg4HoJK8Ia/ sSMGDeOCYNEthoPAheUNaVsSICtWkhyGqFooiPNH7XHZIfb7Uyutr8le/4liP306NJdA JJgB3Z3ZJvOfrM6tMj6x7C7DCLqoO7M5ej64LNeWUYvvrAxWWMMC6YWyIAC+DCJiCtv9 dFc/R2H/R37Y/tyL4ydm5jhYePGEVBX/DUa9VWFSYtLqkDColQ1xB7T7yuPZlBbzAVIo ZyF+eG8AZjYeaBRzIlS74Igh1OK2lEbtsdXQ3oaLM3FWAYp7ab05J/gkj9vOe57EUvGy P68Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/euBZgy5QU+9XHqilJN2KbYUz9s2i4GKNn2XA1JE5cI=; b=PW7G7Fl3JZYyk5JyjiQhj0ogQbC83N6WpGGcwQLj6pU7jiVu89ucOy9T6O2oQO2Zpi ukV08CrY3ZvcvaHSj3hASXdK1rVAzUcekOLYJqdDRisMaKPrZCEDl11LNc7SQiUDBkwB T3pGbJE75KDPakPbP4c64/tg03SCVWyYx6XltaghRo0MEtGVFRVzpWohPottdzLc8sxd EaXxlqzqgZr3Oe71rGTpUg6NVo0rt1ESYdStie6oh+XuXWDnqbFDFgCxC6RV4zM9g2f2 BQYM+vADESl8+TwHPBjl37NGB07yxFcOU2qVeTcacRiR6dCIestKtesoIvbTuHJsGBmo 8m+Q== X-Gm-Message-State: AOAM531RhAF0BvSFtqo5lEFR8REknu26UOrgo8NIbtflmqUoK+NdBIfo DjSJu6U3498qyp4h8pmIvLVxUZaZ6WQoGZSL X-Google-Smtp-Source: ABdhPJzWdTUkkcSKYEUrREhqs0/o+iv7F8+KIJIhn6NmpITpgshvFl5dIMYA6T6208PWkfFXufGqZQ== X-Received: by 2002:a5d:598d:: with SMTP id n13mr20011258wri.63.1642624718969; Wed, 19 Jan 2022 12:38:38 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id v5sm6031782wmh.19.2022.01.19.12.38.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 19 Jan 2022 12:38:38 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jan 2022 22:38:36 +0200 Message-Id: <20220119203837.9047-1-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] libfdk-aacdec: Add an option for setting the decoder's DRC album mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavcodec/libfdk-aacdec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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; -- 2.32.0 (Apple Git-132) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".