From patchwork Wed Feb 5 13:06:52 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: 17694 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 78477448997 for ; Wed, 5 Feb 2020 15:07:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5360568A98A; Wed, 5 Feb 2020 15:07:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D42F688046 for ; Wed, 5 Feb 2020 15:06:54 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id z18so1456010lfe.2 for ; Wed, 05 Feb 2020 05:06:54 -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=zSx0NBxUdDIUmv7fe0dLczflRExLqiSARVqmOykqrdA=; b=BwZsq489ODJDnSfpRcRjziDIUReMbA/nLG4xiWC/hhl+Ni7VPzQehzutzY/+nRSUKC k2biZK3/J/R/f0Lj84FZWmtwmA/4i/rCXsxvJFHpVUx1KFGOnWd8HApEWTkuYJG2B+L8 1eegBAJQhRdjOe0fjNC/kW34BbgThM2uPdLAgZTzm1jdsV/OzCXXgp0yGg6vukGgAzhj weso3X5BI1iRaY+Va/UVEGLQ5MuECW4e9JVRKok47f7Mlc+LU+tBfzXUl8nWO+ELIyVt O6KL5N4eQBv0/a4cHidZ2KtK1oAT/2F5ji5VvIMUg1tS7Zu3s8OqnM1Uk0p5fs+T7X1U iRIQ== 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=zSx0NBxUdDIUmv7fe0dLczflRExLqiSARVqmOykqrdA=; b=cixf62phoaEy/GeuNROF0GrCnkxNl56x64J2AlyVX6/sVr11ZiRraUX5vEPsvWOUFC VkzehdON4zpW68M50bV6lKsKPcWeW+YAcRLCFr8cuw+8QiUG+rsQ7RdLKjk+C8oEXDam Y2yivMgks1V9IOupCvutVxE09IIhRjXKayN/K6Eca5SMg4Clr3buaSDss6/2hBeXVNPD A6oucoRWoFQGhYVqI9DJvtgd3vwqeZXwPlMpIHbYbaPLR+lAo6NYFfzp/mL7izUDpmFY hypkT0ESR7/Z0wzvLBXsH5NK+v+oMZu9ZsQRqK6Vk7ay/7N9xskmDkygEzTZFKbwF+vx Nq6w== X-Gm-Message-State: APjAAAXrv8uysDaH/kJQyIagwvzJGynLImaXrlfsZKJ2xELn4EamcrqI vp7Wakjoxiw+j9nB5r7kYb2B/Wa5lNw= X-Google-Smtp-Source: APXvYqyLlt/HYGB/MNVY7lavBSBhQ+M+hrgSOx4Jojt4oZUY2W1A57gwi737mutRZvqLJR3E5ai8dg== X-Received: by 2002:ac2:4c2b:: with SMTP id u11mr17879374lfq.46.1580908013504; Wed, 05 Feb 2020 05:06:53 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id b17sm12100943lfp.15.2020.02.05.05.06.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Feb 2020 05:06:53 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Feb 2020 15:06:52 +0200 Message-Id: <20200205130652.75949-1-martin@martin.st> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <6dca74b5-175f-be3d-3b29-7f7e863ad952@gmail.com> References: <6dca74b5-175f-be3d-3b29-7f7e863ad952@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2 2/3] libfdk-aacdec: Use the decoder's default level limiter settings 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" It was disabled by default in 2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e as it added delay, but now we compensate for the delay properly by offsetting timestamps. --- libavcodec/libfdk-aacdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index d9b080cf3e..b43226f515 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -81,7 +81,8 @@ static const AVOption fdk_aac_dec_options[] = { { "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 - { "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_BOOL, { .i64 = -1 }, -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",