From patchwork Sun Nov 20 19:07:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Degawa X-Patchwork-Id: 39359 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1703092pzb; Sun, 20 Nov 2022 11:08:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf7zef3fjY77XlJJaHooPbvd+l/8xl4zcDme0/bNN8BBA13/HZreXmQgGjD40YvTT0EYip0Z X-Received: by 2002:aa7:d1cc:0:b0:468:f964:372e with SMTP id g12-20020aa7d1cc000000b00468f964372emr11539986edp.326.1668971294581; Sun, 20 Nov 2022 11:08:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668971294; cv=none; d=google.com; s=arc-20160816; b=tG0wEeUxDqHjLUmUieL/lqqGqxLTIE0907xuLnW4iNqPneVEZ/QqK6JBvTV8w46aVl 8fm5jd+jWR9jo08tj1pFuECjZ/qXOlmkkHf/Ger6m4aN3xPDPsL5mkoUocrw72IDVqAR du/cxniOD1chih5AF3hLQuopF/p9k5jGn+V4yva45+q8bmHScESgahmLak5/TfKLJajF tKTq3FzertJoO+028wERlGOE4v89sZs5QDfcHSoLXKei+4SIaAs1GWcRC9oP0b5lwKbD RyPyEKNB13w9sttrdkt71W1HKkFgozmv/V+VeJJYsiVhu9D3LCfePeSY2LagKKxNQSan JYtw== 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=NGa0fxuaEXoODcDRcZTds3KUgKCOjs91lWdym+8fCB8=; b=e1bSksF6t/La2TV4vGiPVAHnjp8J6eMaXr7339EiY7foPiMfjc0WHynt8nRldNIoPa ZNAxogpPtW7kLPAaP+axQzuA/tfn8D+a0tGcPNokanMFk0MVj25I5rAs0xm/6lBmQKoU LEgbCDX22stOJo2iDt6q9Wd8hozXpFFH6dZPpeDT07zRQLMjfFc8DIkne5jVU7z28oIY +yl61lPOCcNGO6OAUJmCmVJMUNQtBq6t7yIVLOiQOy97WN0axwMCy4aHXbIp+55dNAJU 8XDl7a5luGqVyBV0Bx3k/C0cYemKvJzC5i4oQcVQ+oXgobCQP7cx3vu3vXa2Vbh4hpXA kxfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@randomderp.com header.s=default header.b=Lp50Yujr; 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=NONE dis=NONE) header.from=randomderp.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g14-20020a1709065d0e00b007ae9abf1990si8916536ejt.352.2022.11.20.11.08.13; Sun, 20 Nov 2022 11:08:14 -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=@randomderp.com header.s=default header.b=Lp50Yujr; 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=NONE dis=NONE) header.from=randomderp.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3049368BB66; Sun, 20 Nov 2022 21:08:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from degawa.com (174-127-109-95.slc.westdc.net [174.127.109.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA299689E3A for ; Sun, 20 Nov 2022 21:08:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomderp.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q0yuQFbtflcDuHYUD/WoQC8lL9/Kv49PXYXECcVaQpk=; b=Lp50YujrGfNqBMP2NRwNkggRYy FYdtKqg39gBW0ggsOX1MqBjXaXvN6SKaDDonsIgeGL/ZoYV3f+IY0raIsq7aAc9BOVi3zsNZjRoR/ Oe9XxA+UXfVgiCspbxH0ODxBKtmmSP2TAHyMP/uxOajtiOEZWa6VrL3Yt75nmlBKb3HA+TQ/6ubmy qyw0eiBePQebQxyT7VvAkLjLyW75P0DJ1sjTdhZYqR9mWkX+zJQExuYxhUtQCoFbad1mVsAskJUJN 0h5yNcDjG70F/6nuxhjniOLSFSgjvEUMwU9thLpF5yc0qgzF7aK87P3aVueziYOnzpfeM9p1mb095 Pze3Guvw==; Received: from 108-216-168-194.lightspeed.mmphtn.sbcglobal.net ([108.216.168.194]:35906 helo=localhost.localdomain) by slmp-550-1.slc.westdc.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1owpfd-00424X-LM; Sun, 20 Nov 2022 12:08:01 -0700 From: Christopher Degawa To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Nov 2022 13:07:36 -0600 Message-Id: <20221120190736.1781675-1-ccom@randomderp.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221120023350.1684083-1-ccom@randomderp.com> References: <20221120023350.1684083-1-ccom@randomderp.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - slmp-550-1.slc.westdc.net X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - randomderp.com X-Get-Message-Sender-Via: slmp-550-1.slc.westdc.net: authenticated_id: ccom/from_h X-Authenticated-Sender: slmp-550-1.slc.westdc.net: ccom@randomderp.com X-Source: X-Source-Args: X-Source-Dir: Subject: [FFmpeg-devel] [PATCH v2] avcodec/libsvtav1: only set max_buf_sz if both bitrate and rc_buf_sz is set 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: Christopher Degawa Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aN9cQmgaqekL maximum_buffer_size_ms should only be set if both are specified or if the user sets it through -svtav1-params buf-sz=val Signed-off-by: Christopher Degawa --- libavcodec/libsvtav1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 48cd58a0b3..7605baddfe 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -179,7 +179,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->min_qp_allowed = avctx->qmin; } param->max_bit_rate = avctx->rc_max_rate; - param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; + if (avctx->bit_rate && avctx->rc_buffer_size) + param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; if (svt_enc->crf > 0) { param->qp = svt_enc->crf;