From patchwork Wed Feb 22 02:12:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JonHGee X-Patchwork-Id: 40467 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3219289pzk; Tue, 21 Feb 2023 18:12:59 -0800 (PST) X-Google-Smtp-Source: AK7set+qoqXdl59Iwr3KRElK9Xb1AsRys1WBJZcwPZQZwY7WxAh2lcQ/dX0gfwIBFFeOehvwPD3f X-Received: by 2002:a17:907:1c8c:b0:8e6:d08d:f5e8 with SMTP id nb12-20020a1709071c8c00b008e6d08df5e8mr758367ejc.11.1677031978858; Tue, 21 Feb 2023 18:12:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677031978; cv=none; d=google.com; s=arc-20160816; b=Uj4meyHJt/u9OF3OP+Suz7VMZXOZOn0G0YGMU8xDyB6t7aFps1WrXvqWV6AO8JUQ1d aFLFMxqZthzGB4LXjyS6XYHZ9mkvuBGHK0juKVv6Zw97pNiqhd6g3EQBIPo08uEmnyjE E87ro4zJLcgSLIVdl5CtMpPdNG1kDPXpvOXu+Z1tFk2OCyCD5/P1aMsRK0ZFfUTLpRio fLoxNjVEX7cp9RxKCrF4TAf3lJMNDScJECgF4onmTS39fz8cqtHIokMxtR6QAw89AySZ QjMuF/0+y/X22HZ/JmYuuGLW9uQG8AppeEhkGbOr6bheQV57wZiczNGJ9J00aSWlf8z+ BtxA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=OhAcynj8w3kajrMmgP/qDCPIueopeCOst1fsmdQ6k2Y=; b=yE52jWc1AVgXW22sOZsc8TGCUQsBBVqEQ9dchZpjAEMcaF/4hoYyfsbYMC5ENQfKCe TLY//JI9GTJ2YqUzJoobK+WJ/has+DZLgWzvc4QJvkG4QJ+xnzhDK2RKa4IP4TKwqtim P/hXpcoVAOi1906Tijx2w0Vt8YrZY0IRGqq3ePPVNgYV8isIe0+4n8bZK1d53yOnpCW/ InUvvvhY+8oMaS0LBfUvhcgNhdTvK0aufNo2TPmYS+lrCMorHWD9l8xJ7vA8iMgiQICn /XEiWHaFWvQIck/E1rb1ENiuBMhZ8EqqgArvX53TuZYwiOET0VLquoCRkuNFmFg6dz42 p/Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=O4Z1KMh3; 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 f18-20020a056402069200b004acbe0c5f69si7001223edy.444.2023.02.21.18.12.58; Tue, 21 Feb 2023 18:12:58 -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=O4Z1KMh3; 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 6903A68BFA7; Wed, 22 Feb 2023 04:12:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6726868BEEF for ; Wed, 22 Feb 2023 04:12:48 +0200 (EET) Received: by mail-pl1-f177.google.com with SMTP id z2so7324460plf.12 for ; Tue, 21 Feb 2023 18:12:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vFbsvbIwI9Qd9rcd0cPSyNOoPMn5aqYe6M1Rzzs3+/Q=; b=O4Z1KMh33H/lpC39Fv7Iaj7bgtTu/uqQRBCTGJOQk2DIvypSsSw0RUaU83D1IPsuRT zoywGt96Smk7PcMfL4klGl19mgFCm2q+JEI66LoxSBpkVi7cZKEdSa+HmehDlXslOKXW Hd9dlVfbCfzCVYdtFI59EFxX57NpAK/ljM2ErleLJ7W8bveonfGjny56aOjhRXXbzZ9Q DAGUr+T1wAniHelFGc3GQl0gNwwLHZCWaG3eaCXDMph4EQwnxYmIpKybtZpA5zVQzsjo 8ZbkmaGUWimbsNivAN/kqFRc80uQSiIV4EnNZx5oXVecMK+Pb8hZjXzBB8OxZXDUeZIf xsBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vFbsvbIwI9Qd9rcd0cPSyNOoPMn5aqYe6M1Rzzs3+/Q=; b=q8RRmfm9C6u8PaLgmaEtobIlHnH1k5TRSFx7u7z7MXNOhM58weZVMLeSL5FkujlAAh yhNPwLdTcB2+79dv4stbCNpekGkopSu/a57VW5HmItMS95wzVrB5aMpWO1ytE1Miobbd zYaqFPOXDeYO07WFfqaNI1Xq/v2sDJTvpaPVg1eJKgRRzfXq+YbMeIcVNSm8egJj7cna MYlmD3F3U/Ek87NTiJhldseLfvYU2Yx0EpvW5YeWKi6xsZw38W91UtRRJcjG+wXeQjGl sW2nCnbfCVW4Q1U+k3HDVBahfQlnqI2ihI+SzcwBs7B96zMydQU19t8+dzXAnbugYOux tL/g== X-Gm-Message-State: AO0yUKVfGRqipqn2hIwXVVAd0I5b3Pk3zJxit9kecpllAbjZZSl8XMKm VlRirMBFKGGZeLtwHjwIQxzqFeYoG2SZFg== X-Received: by 2002:a17:90b:38c2:b0:234:9229:535e with SMTP id nn2-20020a17090b38c200b002349229535emr7019543pjb.23.1677031966000; Tue, 21 Feb 2023 18:12:46 -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 ie14-20020a17090b400e00b002372107fc3dsm1695430pjb.49.2023.02.21.18.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 18:12:45 -0800 (PST) From: JonHGee X-Google-Original-From: JonHGee To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Feb 2023 02:12:40 +0000 Message-Id: <20230222021240.2370954-1-JonHGee@gmail.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog In-Reply-To: <63F57060.05FE3A.50083@loongson.cn> References: <63F57060.05FE3A.50083@loongson.cn> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/libfdk-aacenc: Scale 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: Yd018JKSdk3z libavcodec/libfdk-aacenc: 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);