From patchwork Tue Jun 18 13:48:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49992 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2569347vqg; Tue, 18 Jun 2024 06:48:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUNKcn3GK9LJ1cbjELhgzfNdDdZWGzAy/moL44px+0JYYvP6uYflAqRwB7Yjho3iZVCzMa9dxDoM48qol0ewzYVGaikaa8Uf6h8YA== X-Google-Smtp-Source: AGHT+IHHpoVGd0M2SvAigEdjRlk6cJYwXGcuJrFkCpiGpTpw7WDyNrmF4nQUy6N0wCHk7Xm9LgBv X-Received: by 2002:a50:8e52:0:b0:57c:fc75:408c with SMTP id 4fb4d7f45d1cf-57cfc7541ebmr1236633a12.19.1718718529496; Tue, 18 Jun 2024 06:48:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718718529; cv=none; d=google.com; s=arc-20160816; b=W+oK7GRBawxdonnyostIIcgKDvv2s8iXvsaenmtGxxS9Nlg7vO73Vo9T4bHhTEFHQJ sRgY0wFXjfv0rrlQs7hqrKTLT69sfE5bgal0Za2fUkQjI8b7EW4mWrsF3jjzUmRCKTKp 9CK1UMzBqCJfg6eOhHm5mmfaBf5EKPfkGhDlP9dZZwszuaVXydp9E+ErBpMeodNltyVE HbDJwB+jHrzpAhI7R1yac6UvtnB37Eq5ARoMl6dN5cdV3v1mSnZ+GB5KmByMskEAJQjo hHlmfomNvwSC+/rpVxi80j1qE7GVFZK6rP1KqQ2vE5KSCsMSjrtbbKjMThKPlfV7eBsz QvhA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gytfDHr4URqLhTa7mAcRRSafUyOaZ+Czn1cKEi8KmyU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=hD2QHYp9diCmDR4OprTR5CMXNOAO9CnGYJG3WYFfPF/wUrkbB8VZKiJ9L231SL2T60 uB3Rd376TzwDTLHns8s4zS1YzmdP3crPua9XL/uTFTChirHrxL7Z9PBOiMgsPkk8sru5 KeFZhIeDNvU0QS8W82fZArYH4Dqz3skxmI4X6dhP3jysYeG8OEAoklGshSP/a+ikB+He ng5pPukjnwSkIlK2zRezDr7HIIli6DXexudDr8WD4wg/mCLUmL8rgrzem+zr6ZZMPTjN k4rGKduj3aOWHRtqBOnWEzGmN1ZceavU3FqtodJ3vqfEwBz/ECnNA1NX5PDJGggnzHGa PqSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="nx//uD68"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57cb72d6222si5751922a12.113.2024.06.18.06.48.49; Tue, 18 Jun 2024 06:48:49 -0700 (PDT) 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=@niedermayer.cc header.s=gm1 header.b="nx//uD68"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0B2368D7CE; Tue, 18 Jun 2024 16:48:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5CC268D28D for ; Tue, 18 Jun 2024 16:48:28 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1D05E1C000A for ; Tue, 18 Jun 2024 13:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718718508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xTuFf14dgCjPlI6/ymzXb7WnSoKEp4JSfXdufJkY24Q=; b=nx//uD68Qc9tNmyb3AwJ1d3nWf0X/OyUus9lrQENwrqFdToGzYLClB2bD5r+YGt3Gebls2 dJ6Rc0GmHcXzukYGjJ/JmDAFZFrHdnmOjby4s1EI0LIa0JXahJEdprRtRV9aokkd+4lFhm fmX0HcVQBp6EcXrt8eQ++9AK2z1STpqM3Soull5y2EZZvyfWpgBhtqxDLe4k1hUEebGofo AiNR2HDmVT3fPzpSIy2L1b/i9Y3sbST7oU4XmsrYwcKm+xYXvLSZBxleDmn9i7AzN+fZUT FujRbYA5Grw0gV2HBDdp31AMcPnI5eEzqS1+fFhROJjxNynKQdI1d7frrGw2JA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 18 Jun 2024 15:48:21 +0200 Message-ID: <20240618134826.2189719-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240618134826.2189719-1-michael@niedermayer.cc> References: <20240618134826.2189719-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/ratecontrol: Try to keep fps as a rational 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: Ow8k9Q/R3jD1 Signed-off-by: Michael Niedermayer --- libavcodec/ratecontrol.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 609d47faeb4..df27639ca73 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -56,20 +56,25 @@ void ff_write_pass1_stats(MpegEncContext *s) s->header_bits); } -static double get_fps(AVCodecContext *avctx) +static AVRational get_fpsQ(AVCodecContext *avctx) { if (avctx->framerate.num > 0 && avctx->framerate.den > 0) - return av_q2d(avctx->framerate); + return avctx->framerate; FF_DISABLE_DEPRECATION_WARNINGS - return 1.0 / av_q2d(avctx->time_base) #if FF_API_TICKS_PER_FRAME - / FFMAX(avctx->ticks_per_frame, 1) + return av_div_q((AVRational){1, FFMAX(avctx->ticks_per_frame, 1)}, avctx->time_base); +#else + return av_inv_q(avctx->time_base); #endif - ; FF_ENABLE_DEPRECATION_WARNINGS } +static double get_fps(AVCodecContext *avctx) +{ + return av_q2d(get_fpsQ(avctx)); +} + static inline double qp2bits(const RateControlEntry *rce, double qp) { if (qp <= 0.0) { @@ -332,12 +337,13 @@ static int init_pass2(MpegEncContext *s) RateControlContext *rcc = &s->rc_context; AVCodecContext *a = s->avctx; int i, toobig; - double fps = get_fps(s->avctx); + AVRational fps = get_fpsQ(s->avctx); double complexity[5] = { 0 }; // approximate bits at quant=1 uint64_t const_bits[5] = { 0 }; // quantizer independent bits uint64_t all_const_bits; - uint64_t all_available_bits = (uint64_t)(s->bit_rate * - (double)rcc->num_entries / fps); + uint64_t all_available_bits = av_rescale_q(s->bit_rate, + (AVRational){rcc->num_entries,1}, + fps); double rate_factor = 0; double step; const int filter_size = (int)(a->qblur * 4) | 1;