From patchwork Tue Oct 3 15:35:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44124 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp2141017pzf; Tue, 3 Oct 2023 08:37:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGY8ytnWP+l9zxwcMbMvj2nSWnSLwopbOqh2umnFA8VOjTKkGhqf7VkVQEnYFatX/fGkQsg X-Received: by 2002:a50:ef16:0:b0:530:74ed:fc85 with SMTP id m22-20020a50ef16000000b0053074edfc85mr12565187eds.3.1696347431423; Tue, 03 Oct 2023 08:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696347431; cv=none; d=google.com; s=arc-20160816; b=yw4wjXddU5/yJqrCYwZZ8VrX3ZB625Wzw76b2SSNCls6K6VInAGtPiGV5EyoXKn1K8 HQ6eSAFjHLWOknjAdaST71pR8isjUwaZorh0vCbPtT+zJhDUE+y7kU9defYG5xl5/3Uq FtTTl3rQU64YEvg5skF9gE3jjxgML5vYcF80NrHvdxvAXUKe/11BfkVtE6TcdedeK+Uy MV5xQDxBXP+9/OncAk9V5jlQ8oQuYVO5hHOdzti3nnPXdjx2dKtaQmbp22DTwUSyarVB DZa94W3PPtrmO0cP0yOkL0HQ6aXjfH++nIjNCw7xsn9Q/XS3Y/cblcZAwz7OWkQFR5KE qOKw== 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=AhXx/FMmEy7GJa38O9DVMDJxulqRC/vtbTaPQitCD78=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gtFbl1w6WOxgMV7Lqjjnfwdm2IHeazO+nABFUg6r1PwtEkfaTb/53Ohj8tmfijF6RO MoDBiMZaPccSNnPndf6r8h2xjo8eIl6PfjzjV8Xmf9LnI9F7vJwMt0vImBl5fSOGzjnu WFMOORWkyXlBmf8gvRirBvm6p9pvvGLfor0zIYucjuvkeDMz9lFK83FO1XZI+GfMMJQ/ GKq33pBM+MdxzWxStzwU1iY9Dmt69kes22cawQsxwfciFCMLxg+HHTLDK5kVXXfCcEa1 w4hiLJIUkzlHO0W8+3Y+irPJ5MiA412IsIfXThsvFdSfT9pPTfivSVnAwmR3eDmCyrDK Ihgw== 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 r21-20020aa7da15000000b005381611bf18si700669eds.456.2023.10.03.08.37.11; Tue, 03 Oct 2023 08:37: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 624D068CD58; Tue, 3 Oct 2023 18:35:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D17DB68CCF3 for ; Tue, 3 Oct 2023 18:35:46 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id F04F2529E for ; Tue, 3 Oct 2023 17:35:41 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id znvUAVCih0l3 for ; Tue, 3 Oct 2023 17:35:41 +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 mail1.khirnov.net (Postfix) with ESMTPS id 369C25286 for ; Tue, 3 Oct 2023 17:35:40 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 48C8D3A0773 for ; Tue, 3 Oct 2023 17:35:33 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Oct 2023 17:35:22 +0200 Message-Id: <20231003153526.19228-8-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231003153526.19228-1-anton@khirnov.net> References: <20231003153526.19228-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/12] fftools/ffmpeg: stop accessing OutputStream.last_dropped in print_report() 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: GqkX8I1T2RTn That field is used by the framerate code to track whether any output has been generated for the last input frame(*). Its use in the last invocation of print_report() is meant to account for the very last filtered frame being dropped in the number of dropped frames printed in the log. However, that is a highly inappropriate place to do so, as it makes assumptions about vsync logic in completely unrelated code. Move the increment to encoder flush instead. (*) the name is misleading, as the input frame has not yet been dropped and may still be output in the future --- fftools/ffmpeg.c | 3 --- fftools/ffmpeg_enc.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 14f55cbec7..a854589bef 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -566,9 +566,6 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti pts -= copy_ts_first_pts; } } - - if (is_last_report) - nb_frames_drop += ost->last_dropped; } us = FFABS64U(pts) % AV_TIME_BASE; diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index b1cc60e350..29d0581cc7 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -761,6 +761,9 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) if (frame->sample_aspect_ratio.num && !ost->frame_aspect_ratio.num) enc->sample_aspect_ratio = frame->sample_aspect_ratio; + } else if (ost->last_dropped) { + ost->nb_frames_drop++; + ost->last_dropped = 0; } update_benchmark(NULL);