From patchwork Thu Mar 9 18:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 40630 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp577384pzb; Thu, 9 Mar 2023 10:57:56 -0800 (PST) X-Google-Smtp-Source: AK7set9RAil1vI/5Kek1MB5TQQJNMO2J2vgT+oUN1aaOeNx33VJk0DmppgqW6RbP9pcP8dxqe0g8 X-Received: by 2002:a17:907:1c1d:b0:8b1:3a8e:232 with SMTP id nc29-20020a1709071c1d00b008b13a8e0232mr27607654ejc.74.1678388275952; Thu, 09 Mar 2023 10:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678388275; cv=none; d=google.com; s=arc-20160816; b=DBi/WCDfJTHazU3sfSMusL3dM16YK2JhOkLZ2+oAMh/PTGzwLcQ6+HIQTK9cFTKAI5 LNIcBmJwkqRPhIytFiiZeNsCDTCB1OAkQGWQe62/yZNZVJbf3jUtkbz2fZGy1ZVpsayH wwQAlX1k2kCbiy9yOQzToihLQeSLDHQActEIb5w2Gdx9GkogV9tIyc4oLYK+sQXOXYfK 2vMnMz0TUbwjKpsWXqTeT1YU2CZPVa+U+1n/e6DVD/r4ld2wq/pvsK6xTcJWZFAH2eYX /TY/Z+6Ud9fDycDgo8aDgH6xa+uNLSWkAGsMaaCdEb+spTR81S3INbGL/Vf7EoN1layL /HnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=Kt1A8pyA8hziPqiaYtfDQSYA2O8+mQ+dRbXvbKCCfZk=; b=O4RF+XNtbogcatOwVgpoSn/BXdx59FVQIleiCzajAKH3F1X5Oen4CxiND6ttON1WcP t2wgeonb5Fwnp7OCvBRhjZA9+GePRswyGiBARPSQqoKIQUJo/PLjmQm2eXhgQXr49Mvx zBA+VGCUNCWSSHOqjJ45GHRQwXU2Mb1EMv5AO3FQnNmmDIjZ1ZUbyEWfmitfhWel+A0a T1ZvaEthweE9tReqtyFH1ImC9pvClOg/AaYTgv4wMOPpNz8+ZhMvxVjrck+SYAsFqk/H dxAtDhWMYzXhuo8lzLdMv5mGtabWwv3ig2njZCBda8JYQ/zFUADiJwvCRKVXArbx4aaV L2Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AIh1rx8h; 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 t12-20020a170906608c00b008de88af9a7esi731993ejj.171.2023.03.09.10.57.51; Thu, 09 Mar 2023 10:57:55 -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=AIh1rx8h; 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 677B468BB98; Thu, 9 Mar 2023 20:57:48 +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 0F34E68A606 for ; Thu, 9 Mar 2023 20:57:42 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id i28so3624306lfv.0 for ; Thu, 09 Mar 2023 10:57:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678388261; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Y0AWJUnfV6g85YJkgz2I3qbv6n5TJXrRRsjjDXI0SZU=; b=AIh1rx8hwT5+IVUbjVwj44BaNClfvNcWz0pPt66vE5xtE8eDoiQWGazOx2mBTu4C0Z 1IBKo35pbzV6mVfrt3SyNTxsMvP0RFrae6VUyIW3RlICsTyLRi/Rz+6DsLqfyPdwD2PG 4pMiFlZZQTHTQVkUmue0Q6tVRavSJ0Tj7gpuqtC6mPXzYXS6wK4MptK52HX7o+ZWMk2N ya28bh3nVbUDvIxkOgC1VfiwFL3XwKFviesbSdi+TPeXVCrnbITlLhUsk8SFKUzWwBoL sPYF0QZD/ICIorQb+onOsbgQvlI6lP+fFfCGANVjzKquJGEj/K6KGWIV6fHVUKaWcGJi +J0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678388261; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Y0AWJUnfV6g85YJkgz2I3qbv6n5TJXrRRsjjDXI0SZU=; b=EA+iopvENCHAgWDawR3a/zZkWaJ8lClAe38ZJtScBCDMyKP0geYxs1/xozT3K8M8pA tRN5qgA77b20vR7sSqin4ELzZu/2rrCvIpX2sni1bUgwRzqLZPEP5rM1yF9QMl/80KbK pc+omhEWQkvlMH8vqe0ZEGRMRrQfoyj1Jlvb1zKE9mND56AmjfaB0yui26Av2aWiimGD Hw76qoguC7DUBGZSvobylbQWN/U6TVrrGeZgNbQCp2KGZpffz7suaYxs65NIHnUjU6fu d0X1WgYelyxsI9MrL1rb8hTqkpvan41jNtjNf12AwI6Q+aIQ9yOspqzRc17Bq96f0mdm pvBw== X-Gm-Message-State: AO0yUKXHVH/R3AZLfte3unxM5/FvEQp+XeB1T3TLGvTwh420d+kpR+JF kVi+BdpyW64rHhOHhHot/O9G/0tpJqk= X-Received: by 2002:a19:550f:0:b0:4e0:abbb:e70a with SMTP id n15-20020a19550f000000b004e0abbbe70amr6313570lfe.47.1678388261009; Thu, 09 Mar 2023 10:57:41 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id f19-20020ac251b3000000b004d1dbacdc93sm4019lfk.299.2023.03.09.10.57.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 10:57:40 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Mar 2023 20:57:35 +0200 Message-Id: <20230309185735.93571-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libsvtav1: use larger of bit rate and max rate for buffer size 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Fxnt5wty15uw Generally if maxrate is set, the calculation should be maxrate over bufsize. This additionally enables CRF + maxrate & bufsize usage. In order to keep negative values from enabling zero to be treated as larger and causing a division by zero, check that one of the variables is larger than zero. --- libavcodec/libsvtav1.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 56e1e22b51..9174e2753c 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -184,8 +184,10 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->min_qp_allowed = avctx->qmin; } param->max_bit_rate = avctx->rc_max_rate; - if (avctx->bit_rate && avctx->rc_buffer_size) - param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; + if ((avctx->bit_rate > 0 || avctx->rc_max_rate > 0) && avctx->rc_buffer_size) + param->maximum_buffer_size_ms = + avctx->rc_buffer_size * 1000LL / + FFMAX(avctx->bit_rate, avctx->rc_max_rate); if (svt_enc->crf > 0) { param->qp = svt_enc->crf; @@ -302,7 +304,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, avctx->bit_rate = param->rate_control_mode > 0 ? param->target_bit_rate : 0; avctx->rc_max_rate = param->max_bit_rate; - avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL; + avctx->rc_buffer_size = param->maximum_buffer_size_ms * + FFMAX(avctx->bit_rate, avctx->rc_max_rate) / 1000LL; if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) { AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);