From patchwork Wed Feb 22 01:21:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JonHGee X-Patchwork-Id: 40466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3194184pzk; Tue, 21 Feb 2023 17:22:52 -0800 (PST) X-Google-Smtp-Source: AK7set/6cQ9q8+pHpARVKMk6F5W6sv1WGfEirwTJdR3fnlmiLKNnB920X/+o+XHCXWLjpDrnYHCJ X-Received: by 2002:a17:906:248c:b0:878:5f35:b8d6 with SMTP id e12-20020a170906248c00b008785f35b8d6mr15205130ejb.51.1677028972324; Tue, 21 Feb 2023 17:22:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677028972; cv=none; d=google.com; s=arc-20160816; b=SmzFyXH+wrvYCrop2FtKSu440oQeyaxN6GIe3HGii8YuIOcaWGTSxPhwNO0vM1rbD5 zH5Izcmbsv1DKcqaZQop0wnhTbG3Wcd8WBxPUuvHI+Zpl2bHIppMEj9r7f4Tnka0JE0x RnMON1CJAprZxMJWbGlL39hESA8ODAYCNu0Y2jW4uTfRjQNAQh8kMHoZZV/gFIs30vMy EIIg0+Z8Qe1ONi6qYoJjWmEYOu2XMChbRZLQP+P/sLZ86jCr06nTF+dy8z+Q7zaeOoFO sSH+wBEND0W5UvAokTziSjt6CkyETh3bAy8+LFJnGARO2r6UP81vIO+84QWh05SdkDwG 1qEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=RMd5XSh9llHxgk720m7tLw61j6fLgoDcgcRYHQ96CzI=; b=o5g6remgJhpobQhJqB/X1yPopTnj+tbWMUaOl1uahsjF0LAdU1ryZLMRlgkZCfA+CD gXbytU9LbndAzyX5fB0Prpn5trTMbiDUrvWwbhgZ3BJZINm7G10ewKYq93e1OrB6gTVN Y+MTrqXanEyKnb2xkjnUrKmQMbppFKmNqKGBVvq2g8lXdmzNk28uPC1+Vo/2NuIWT8cS USpc2j0fjPIucDCPLvMgn2DfwlLsD2gb/JZXraOX2OQcA/VRm98lS47kOntRnOiMMXYC D0zIHmfamY6mrtkTcySME4qINNFVotxT6XaU/vdpQ+ghklroNQS3EV5gBTr1D6XEzBs+ ZuzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=N6GNzEEY; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fu29-20020a170907b01d00b008b17e1ad0f3si14659751ejc.972.2023.02.21.17.22.49; Tue, 21 Feb 2023 17:22:52 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=N6GNzEEY; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6962B68BF8C; Wed, 22 Feb 2023 03:22:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A2D568BF32 for ; Wed, 22 Feb 2023 03:22:40 +0200 (EET) Received: by mail-pl1-f169.google.com with SMTP id u14so3161356ple.7 for ; Tue, 21 Feb 2023 17:22:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=g2Rnichi0nO5xKJekuBDqDOA4TGEV2WQFvsp+GH4670=; b=N6GNzEEYLtmG7HI12kZVbxRK4r+U5LW/+ypJiAbTKu9g7rC56CgSW2IAsucqPNL8DD ivnzKwaD6F8kZe5+RP64fGV5EdySnHpcet7/kZ3waENcs8pKWeVZEs+0jf2uJ2LBDutT H1xwUWzOSbOp6v1/W18B5ypPs/R3jRLiYoO3Sywa0hm5e/8yDxkG/hD+b53Xn+kPAZQ4 FJhe+/p+VWTmzjCQ3EEYJFlCfNMivXkXFLZt0YKa78yQwbtiIy0n2ZTge4SYEI4t05jZ /Gr/R1itP6GsZTPrvbGwIqV4Be/jjXG6Z5GAcqqcNb+x7CXlm1alwgdOuS6AMF3sr3lK Qp6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=g2Rnichi0nO5xKJekuBDqDOA4TGEV2WQFvsp+GH4670=; b=NHu5aJn1+s6OLWdhNGQS+dFDrhkHnH48EvIxvJf/F2oup3r0fJjqpOB0UiZeBWMJp/ brcbYAuzh+wmG864LInbpd2TReUpms8EXPF7ojmPY34A3ATbJifmbxwq5IIpuXuWyXsG hs/kax/lt394YDCGGsgx5/NTX0CJ4nuDgU2jjQMGejz5m87GDf0bcI///mfPOlBPZKac WBpWeDMaR9qz56gVmpbZC7eNOeJE+0qERtPNPRwdqzmjgbNWsBEUkW/63qgoCBfbtB/W cJoZRp6OjyIbVQ4bmyx9/ipH+hVbq1ISwCVdvnhwr7+BQMMsRSDGUAY1sVuBeLBQ2rZ4 5nJg== X-Gm-Message-State: AO0yUKVXrzVgMIZ9g/5PhDObf7hduJihiuLzF1dUlosZneJxDYGE/wYR 3Rl8Pa2RIftYzuzMq/r0JD45Vhx8fOr3iw== X-Received: by 2002:a17:902:f68c:b0:199:2ee:622d with SMTP id l12-20020a170902f68c00b0019902ee622dmr9601852plg.3.1677028957943; Tue, 21 Feb 2023 17:22:37 -0800 (PST) Received: from jongeegti.c.googlers.com.com (152.33.83.34.bc.googleusercontent.com. [34.83.33.152]) by smtp.gmail.com with ESMTPSA id m12-20020a170902bb8c00b0019615a0d083sm153601pls.210.2023.02.21.17.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 17:22:37 -0800 (PST) From: JonHGee X-Google-Original-From: JonHGee To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Feb 2023 01:21:52 +0000 Message-Id: <20230222012152.2360157-1-JonHGee@gmail.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Scale libFDK encoder VBR mode with FF_QP2LAMBDA 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 Cc: JonHGee Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OaBpeXbAgAbt VBR mode currently does not account for scaling when using -aq options with libfdk, resulting in clamping to vbr mode 5 whenever a value >0 is provided. Adjusting for the scaling factor for proper VBR support. --- libavcodec/libfdk-aacenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 54549de473..da211baf51 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -230,7 +230,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) } if (avctx->flags & AV_CODEC_FLAG_QSCALE || s->vbr) { - int mode = s->vbr ? s->vbr : avctx->global_quality; + int mode = s->vbr ? s->vbr : avctx->global_quality / FF_QP2LAMBDA; if (mode < 1 || mode > 5) { av_log(avctx, AV_LOG_WARNING, "VBR quality %d out of range, should be 1-5\n", mode);