From patchwork Wed Feb 5 11:07:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 17691 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3002444A738 for ; Wed, 5 Feb 2020 13:12:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1509868AB42; Wed, 5 Feb 2020 13:12:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0841768ACA6 for ; Wed, 5 Feb 2020 13:12:41 +0200 (EET) Received: by mail-lf1-f66.google.com with SMTP id y19so1180608lfl.9 for ; Wed, 05 Feb 2020 03:12:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WElh77QHQJZx9zE+SblO/mtKHSQ7dBb/08pNzml1Km4=; b=gPb1V/3+wBqC+IEX72xQxQwx553CehFXlhT1r5OZk7hQhZkuc8Aizl2wRJQOr8YZo7 aOS1Mrn1XFXTzl4gRe8t9N0JyYcIpe9PlUppuNCN+wJUrPudP5Nz1QG0rwnkVeAkoJ2m rIcNW0euyBOGxWJuzgIwpWIcp9Bbl3nNGJvXnK0iUG21QsuxZjGCSCJp8mhtuSgjWCg0 aIIDE2oK4D734VO5IzLXZuSomPQ2vYb/KQqTr3kKLok6KO/yo+8xrrlzyEuMVCacTVng H5PLYz5JRdhYbfhREce6RGUDUeMZxow589gM9c227aNuC8lBH6ebdCH8y0kfpYqIhoPW ULKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WElh77QHQJZx9zE+SblO/mtKHSQ7dBb/08pNzml1Km4=; b=S/OBRbGI6lPzGjjNqjThE76EfNymjY2p0UvdxTWYiewcbf12ntoKU5kYaBXk4ZLCk4 0UBm4CsJwotuLWq/LyKZgjigRk3ghElyuOA0GMKTTAMtmSsRCschzn+2YDee8Lp4keQS gwx+dLZcyY6YA6Qvj+qG5IctmsAKIiW6zgZcRMUJVBRX3Rs35naEd153H58wbVh3WAhE H0vIanRjNCsUE4JkrKChwrQbkFQduknZgJgGxG0HN8csXTfd5ROQMkvDiquS7c0Pigka jahXC7e5DJxwVpa+EOVylSR1eR3k5IsmnjcrnEaeD2n25ZXSnG3tConwCr3TXl+GXyVa jeIA== X-Gm-Message-State: APjAAAWF/M7KuTlpYzUClXGSu85bqFyO/8mPPq2ruV5vnset6CbKKv6Q WgtXDxvLZjm/Yhwa8n51uumlCCOc270= X-Google-Smtp-Source: APXvYqwxYJACdhp3flErqflRTuq/JAgZ65HcYTCeShnEG0yYrQQzDb6I7XXEcIibHB6EJx5uWsh6cQ== X-Received: by 2002:a19:4849:: with SMTP id v70mr17903433lfa.30.1580900833248; Wed, 05 Feb 2020 03:07:13 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id d20sm12881309ljg.95.2020.02.05.03.07.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Feb 2020 03:07:12 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Feb 2020 13:07:08 +0200 Message-Id: <20200205110708.64282-3-martin@martin.st> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200205110708.64282-1-martin@martin.st> References: <20200205110708.64282-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] libfdk-aacdec: Allow explicitly disabling the DRC reference level option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Previously, it was always left in the automatic mode, if the option was set to the only special (negative) value. Now there's two separate special values for this option, -1 for automatic (metadata based) and -2 for explicitly disabled. --- libavcodec/libfdk-aacdec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index 32a97958c4..cc50fdce2f 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -76,8 +76,8 @@ static const AVOption fdk_aac_dec_options[] = { OFFSET(drc_boost), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 127, AD, NULL }, { "drc_cut", "Dynamic Range Control: attenuation factor, where [0] is none and [127] is max compression", OFFSET(drc_cut), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 127, AD, NULL }, - { "drc_level", "Dynamic Range Control: reference level, quantized to 0.25dB steps where [0] is 0dB and [127] is -31.75dB", - OFFSET(drc_level), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 127, AD, NULL }, + { "drc_level", "Dynamic Range Control: reference level, quantized to 0.25dB steps where [0] is 0dB and [127] is -31.75dB, -1 for auto, and -2 for disabled", + OFFSET(drc_level), AV_OPT_TYPE_INT, { .i64 = -1}, -2, 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 }, #if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10 @@ -298,6 +298,12 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx) } if (s->drc_level != -1) { + // This option defaults to -1, i.e. not calling + // aacDecoder_SetParam(AAC_DRC_REFERENCE_LEVEL) at all, which defaults + // to the level from DRC metadata, if available. The user can set + // -drc_level -2, which calls aacDecoder_SetParam( + // AAC_DRC_REFERENCE_LEVEL) with a negative value, which then + // explicitly disables the feature. if (aacDecoder_SetParam(s->handle, AAC_DRC_REFERENCE_LEVEL, s->drc_level) != AAC_DEC_OK) { av_log(avctx, AV_LOG_ERROR, "Unable to set DRC reference level in the decoder\n"); return AVERROR_UNKNOWN;