From patchwork Tue May 9 09:09:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41557 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2917014pzb; Tue, 9 May 2023 02:10:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7BqA/i2LGtaWwJesVqFGgnz1nOfxvrD8XKgA17nvCIkB+H4bl1f0c3AbvAr7eepy/pCyz7 X-Received: by 2002:a50:e602:0:b0:50b:c56a:feec with SMTP id y2-20020a50e602000000b0050bc56afeecmr10540543edm.17.1683623411299; Tue, 09 May 2023 02:10:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683623411; cv=none; d=google.com; s=arc-20160816; b=Nki+9irVIBvyabDEPbHQvw/FZI2umxs/BOiJsxxkzCNN+0y8t07F7eyYoKAtGYtWj6 vkdh1tAXa7mRmwc7C+YIFOt3Q8W6NrvvWcLQruW4G7zHyXN8ZSexVqBxotBlJKplajnA u0hJ90v8+1grcsCQLswFwPIcRKYyE0juqf6JXiRlk5qvrlRtJ5FUi+fAHBnJjxNUUmv6 O/q96lwFa+NTD2ugwzwlsN2E11fqt2jQIyAM4jf8E1AeuyDblXKbRFFWbLW2o638T1ie ms1/69ujE/3edRWocYEMqk3HyFUV0eVMCgDnE/emA2dZEtwXsDKat+5GhhpNStMTuEuI JaEg== 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=WMw86tYzdcD6y+PZDeBTZD4FBNUKHRXP+A52DwvhlYg=; b=K0mofZt98rinpmOfCzHi17/OGzqhikwlGy8ZKfTuwNM/kfd1F0tDJKVlbXybBAcN1P /Br06ZTqsq1R/NAqJAOCt6dgSrsXgE03+aSDaGWcs0qj6yDuaIlUA/QvUff4bDYRNI7r +BDL7G0ttSWuKoFVqj2DtfXRDYVRTyxnUejvbZhRwC8a8sejfCPO2+Yb1lHsojS/tped +2Zik2lWAfUZ9H7OkbGDorOl3y7jydMCTTSU9LpyqJcEMEJYRRVmyHmyHk7GZE0jUDrS Ay2BhjVugvhs4a1OQ63nu+mN27WayWDa/vSRvZx70vTN8g4vlFE68hd+5DD07AAVJZ7Y RaOg== 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 g21-20020aa7d1d5000000b005068469d3a3si1043013edp.254.2023.05.09.02.10.10; Tue, 09 May 2023 02:10:11 -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 F35E468C1DE; Tue, 9 May 2023 12:10:06 +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 4C05C688171 for ; Tue, 9 May 2023 12:10:00 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BF7FD2404EC for ; Tue, 9 May 2023 11:09:59 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id aTgmpRk1mFUJ for ; Tue, 9 May 2023 11:09:59 +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 EB9B8240177 for ; Tue, 9 May 2023 11:09:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id AED173A031B for ; Tue, 9 May 2023 11:09:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 May 2023 11:09:34 +0200 Message-Id: <20230509090933.32380-1-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 11/13] lavc/libvpxenc: send frame durations to the encoder 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: uAJ8qZ1lEzIW Adapt similar code from libaomenc - stop using ticks_per_frame except as a last resort. --- libavcodec/libvpxenc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index a20e949842..f70cc87c41 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1692,6 +1692,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, const struct vpx_codec_enc_cfg *enccfg = ctx->encoder.config.enc; vpx_svc_layer_id_t layer_id; int layer_id_valid = 0; + unsigned long duration = 0; if (avctx->qmax >= 0 && enccfg->rc_max_quantizer != avctx->qmax) { struct vpx_codec_enc_cfg cfg = *enccfg; @@ -1820,8 +1821,18 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, #endif } + if (frame && frame->duration > ULONG_MAX) { + av_log(avctx, AV_LOG_WARNING, + "Frame duration too large: %"PRId64"\n", frame->duration); + } else if (frame && 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; + res = vpx_codec_encode(&ctx->encoder, rawimg, timestamp, - avctx->ticks_per_frame, flags, ctx->deadline); + duration, flags, ctx->deadline); if (res != VPX_CODEC_OK) { log_encoder_error(avctx, "Error encoding frame"); return AVERROR_INVALIDDATA; @@ -1829,7 +1840,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, if (ctx->is_alpha) { res = vpx_codec_encode(&ctx->encoder_alpha, rawimg_alpha, timestamp, - avctx->ticks_per_frame, flags, ctx->deadline); + duration, flags, ctx->deadline); if (res != VPX_CODEC_OK) { log_encoder_error(avctx, "Error encoding alpha frame"); return AVERROR_INVALIDDATA;