From patchwork Sun May 7 13:32:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41516 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1707217pzb; Sun, 7 May 2023 06:33:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ze5dO7xI/2VqljDULjIOz3paVrU9XMMG+AST2m40wQz17l7GFewTW7y4byHkqTnx4qj7X X-Received: by 2002:a17:907:868b:b0:961:57fb:10c1 with SMTP id qa11-20020a170907868b00b0096157fb10c1mr6344408ejc.63.1683466418278; Sun, 07 May 2023 06:33:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683466418; cv=none; d=google.com; s=arc-20160816; b=u5miDaCk8FXirO7vKpj5MqwrHHbXyA1zD+qh4fN8M+5pZg85BzMXteMWn7sfp7XVac 5/p7dpT2iEUAlokbnnJs95kJ3UPLbPAPHdAtrjw7yamgrspfQoLAXxWHka/0y4c2tjAO ygim3KGYqcUkNB9c2vCdNofs6w0ECNy0fBMq8KRWolNNG4mTj7tTQj7TVucQbxVG/sLq Cd5UHpzRV4ImUCZ0Lm65Vb/lhkykD5xZxLVSnQmVCLr/OM3nhtlzzkEO6OHVwJmjpI0V XlrCGeenqHJcUVjLcRHm/+vfmX/mOuN/gUUWXFOkY2ATTZjtysEC80heYV27Bd8GMb8Z +i1g== 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:delivered-to; bh=HNy2P7t4Mo+JgnOGMZx7rt2wpJ2HZ35+jQ2dXbhVf1k=; b=wH7bPfwLutQTZ7AN1wWYrB5WCfUYhV7eEHiq8JVQbN+WNszr8U287AsBTDogRdXWAR aIdeRQP5QJlRgY0RN1rAB/9dL3rkHzQba6hzjcdGp6WClUB2QxCrAT5C8nZUJnZ0vZN9 ilv1YEOZXkc7u2d3twe5R2cehCAokbmVKr9eofTKtsQlGhehQsx/znA4P019FGstTZj+ hNxaPu35yc+W0UGXYTqCTvhrCouJcoBqqbaXJnFHXBbkDZYnPc9Ny7q/zSkpU1ZvT0ga iJjV4d9Y6RvbRC0OnlG/23A8PYmQnI1v/2DvQPw/oZgv3wz8xTG3tLYAXvP6ruHMY6EW B04w== ARC-Authentication-Results: i=1; mx.google.com; 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 qk16-20020a170906d9d000b00965604f0e3asi4406355ejb.808.2023.05.07.06.33.37; Sun, 07 May 2023 06:33:38 -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; 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 78D7868C0FB; Sun, 7 May 2023 16:33:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E33EA68BFF3 for ; Sun, 7 May 2023 16:33:15 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A8CD72406CE for ; Sun, 7 May 2023 15:33:15 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id DyJMJa-tXT57 for ; Sun, 7 May 2023 15:33:15 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 11C3A2404F5 for ; Sun, 7 May 2023 15:33:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 7740A3A1506 for ; Sun, 7 May 2023 15:33:05 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 May 2023 15:32:49 +0200 Message-Id: <20230507133255.20881-7-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507133255.20881-1-anton@khirnov.net> References: <20230507133255.20881-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/13] lavc/ratecontrol: use AVCodecContext.framerate when available 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: /GQ+2ygFaUyU --- libavcodec/ratecontrol.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 6a40f9cbdc..890ae33cb3 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -57,6 +57,9 @@ void ff_write_pass1_stats(MpegEncContext *s) static double get_fps(AVCodecContext *avctx) { + if (avctx->framerate.num > 0 && avctx->framerate.den > 0) + return av_q2d(avctx->framerate); + return 1.0 / av_q2d(avctx->time_base) / FFMAX(avctx->ticks_per_frame, 1); }