From patchwork Sun May 7 13:32:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41518 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1707369pzb; Sun, 7 May 2023 06:33:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5dbIQdT3SeUoKZzfB1BOS7kGv6j5FiGYhBBW7CadJUGF/cM2FTn3+KL68D44kv5zMWz5Fn X-Received: by 2002:a05:6402:203b:b0:505:48c:3266 with SMTP id ay27-20020a056402203b00b00505048c3266mr6032122edb.20.1683466436656; Sun, 07 May 2023 06:33:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683466436; cv=none; d=google.com; s=arc-20160816; b=M73UcxmrgEF1MUE+Bkj4gfuA40CicYvBFC+aR4Uw2hCczeSgHLrEpf888N9dms16Jf YyAdb4KauC/9mzsBbWDGsawPiVHXg8kRtw8l38Jo3nJBOxGzsE5FtqozU2xKADdLXCG/ mJ2LDeUauZTAqRXPtkIbJHUf2KK2GdaZwuKQH6rTVuNoLYTWO8VX/BOqLW/APAM6FaeQ YpAPMTRJyBRZhQUre3vKUe5EdjUVaYtkRBDtTnst0OanykBOU4YlOxb8GSfh6NnX+Fhw CBgiudWxWL/7uL7sUKjKqf/ryiJLoHMzLugLCKC8Lv4H4RqEV4UPhKpvDgLkdcWE/61v ueSw== 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=0pDQY/qVDGh22eagrD5P2icerQBTrrtu9CIpk9s9B+U=; b=Q0vrwQ1MMCkWDGtmO0Mpl33SXJ79zYo/cpwIjuCBmQaMP/moykmIk1u9bYeqePEeCZ 2Jl3I63T7Y9W63s4gInOHdsB+23KuFmCeCDTBhzvXhyE1hWxL+xFaCtTl9zkUHkSOSjd oIHbvwo+C59cEQ5EOILAJasKGa5nENRwAA2vwjHINQFTXjYseEKvM38a9P2+X23AQWtR i1meaFOjTmGWd6GuxPGBkRCMPe792ck2amWW7F7VqWFJpFILRf0rkKc506s+puBLjPpE yN85bh8bmtV5HLaIWpXRwRvg4p9AQocIptHn16SIDFpuv2BhCDYjPm2JgdqU9KlAtMpT Vsig== 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 f20-20020a056402005400b0050489449e77si8040154edu.569.2023.05.07.06.33.56; Sun, 07 May 2023 06:33:56 -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 9933D68C11C; Sun, 7 May 2023 16:33:25 +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 014AB68C06B for ; Sun, 7 May 2023 16:33:16 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B8F47240177 for ; Sun, 7 May 2023 15:33:16 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id VTVqbzdYzRdc for ; Sun, 7 May 2023 15:33:16 +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 140A92404F8 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 8EEC83A1571 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:51 +0200 Message-Id: <20230507133255.20881-9-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 09/13] libaomenc: 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: K/SmDEkxvG/N --- libavcodec/libaomenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 0b88102c77..1d3a4ae64c 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1295,8 +1295,12 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, if (frame->duration > ULONG_MAX) { av_log(avctx, AV_LOG_WARNING, "Frame duration too large: %"PRId64"\n", frame->duration); - } else - duration = frame->duration ? frame->duration : avctx->ticks_per_frame; + } else if (frame->duration) + duration = frame->duration; + else if (avctx->framerate.num > 0 && avctx->framerate.den > 0) + duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base); + else + duration = avctx->ticks_per_frame ? avctx->ticks_per_frame : 1; switch (frame->color_range) { case AVCOL_RANGE_MPEG: