From patchwork Tue Sep 19 19:10:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 43786 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a886:b0:149:dfde:5c0a with SMTP id ca6csp168430pzb; Tue, 19 Sep 2023 12:20:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFTM7K6onFM4d9PLAPLTUq5fEpj1cXkxCx+mEohNTw2OsKG34+b40jbDfUn4MPUm1AZhE8i X-Received: by 2002:a05:6512:3ca6:b0:502:e651:129b with SMTP id h38-20020a0565123ca600b00502e651129bmr797448lfv.19.1695151258827; Tue, 19 Sep 2023 12:20:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695151258; cv=none; d=google.com; s=arc-20160816; b=qCVNq58gLeNOXBgiqlk+OL34+vjeuxOmUpshV0ZNms49mTcoJNgnaVjipIqwRMWOwH 3njZ1YH0nRjhEBNotblonbQvVlpUKuKTuhmnI8+zPYBVbEVzRcQSH3vyWPWpl4hPl7gP e5coxSPN0YA32YlxC4vpc8jmUL6yccnR/84y6JeEGFRK9bUYdfM4Ph31irp/IP5rkXSs IlYj7xCVN+s3Ug2rUPBYv3jRIOlqR6j6qHhqO6hvN58Rsf8Dm/8mdg7Wz5whEcap8l1q oS6NfRzxxbBPP8M446WDtxIyJQcoKUQkpwzut8WQjDR7aevAKPwfREuZgiv3H9O29vN1 51vQ== 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=XVzf1gatBz52B5mzOJcVENQRK9QptYmzHbpHCI7/Ls4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=rWbxi9ioQNUHM3gvGq1SwZphuScmnY9NmVg+PxRNQORXJLKYfirT0XGsRWL+QreMsY +L66gIG+p6HJsoOThBm8PUQ4zN0ntLcuMWVaP+aKZMf6KVanePcYDvlXXC8cIE6gs0Ff Ip48dQaqcC/T0sasoCYmUFhRaQ31cS23vpsBpA9aLW4xDVhUb+QngpMASj60G+WJhhkk kVhpt4L6lyWtlHiD5QmXKskwvqS8cgpqg9eweR10EaARqCYvNbdWjw6ts93b5yT6gNuB FDJvuCXN/1FlDjJTgnEQexQPM9R6Gca0XpPb4we3fksffbXFAhyk4CMWbz2NA3nsSGKq QnYQ== 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 d9-20020a05640208c900b0052f8ee9ff35si10821061edz.248.2023.09.19.12.20.58; Tue, 19 Sep 2023 12:20:58 -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 4F4B968C902; Tue, 19 Sep 2023 22:20:55 +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 A17F868C264 for ; Tue, 19 Sep 2023 22:20:48 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 76111513F for ; Tue, 19 Sep 2023 21:20:47 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 7TWqCHjz116p for ; Tue, 19 Sep 2023 21:20:42 +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 38ECA5109 for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 226453A1515 for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:10:30 +0200 Message-Id: <20230919191044.18873-4-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230919191044.18873-1-anton@khirnov.net> References: <20230919191044.18873-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/27] fftools/ffmpeg_enc: move remaining vsync-related code to video_sync_process() 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: X8juuimTc9aL --- fftools/ffmpeg_enc.c | 46 +++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 9aa00f682c..420fe96c97 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -1048,6 +1048,30 @@ finish: e->frames_prev_hist, sizeof(e->frames_prev_hist[0]) * (FF_ARRAY_ELEMS(e->frames_prev_hist) - 1)); e->frames_prev_hist[0] = *nb_frames_prev; + + if (*nb_frames_prev == 0 && ost->last_dropped) { + ost->nb_frames_drop++; + av_log(ost, AV_LOG_VERBOSE, + "*** dropping frame %"PRId64" at ts %"PRId64"\n", + e->vsync_frame_number, e->last_frame->pts); + } + if (*nb_frames > (*nb_frames_prev && ost->last_dropped) + (*nb_frames > *nb_frames_prev)) { + if (*nb_frames > dts_error_threshold * 30) { + av_log(ost, AV_LOG_ERROR, "%"PRId64" frame duplication too large, skipping\n", *nb_frames - 1); + ost->nb_frames_drop++; + *nb_frames = 0; + return; + } + ost->nb_frames_dup += *nb_frames - (*nb_frames_prev && ost->last_dropped) - (*nb_frames > *nb_frames_prev); + av_log(ost, AV_LOG_VERBOSE, "*** %"PRId64" dup!\n", *nb_frames - 1); + if (ost->nb_frames_dup > e->dup_warning) { + av_log(ost, AV_LOG_WARNING, "More than %"PRIu64" frames duplicated\n", e->dup_warning); + e->dup_warning *= 10; + } + } + + ost->last_dropped = *nb_frames == *nb_frames_prev && frame; + ost->kf.dropped_keyframe = ost->last_dropped && frame && (frame->flags & AV_FRAME_FLAG_KEY); } static enum AVPictureType forced_kf_apply(void *logctx, KeyframeForceCtx *kf, @@ -1113,28 +1137,6 @@ static int do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame) video_sync_process(of, ost, frame, &nb_frames, &nb_frames_prev); - if (nb_frames_prev == 0 && ost->last_dropped) { - ost->nb_frames_drop++; - av_log(ost, AV_LOG_VERBOSE, - "*** dropping frame %"PRId64" at ts %"PRId64"\n", - e->vsync_frame_number, e->last_frame->pts); - } - if (nb_frames > (nb_frames_prev && ost->last_dropped) + (nb_frames > nb_frames_prev)) { - if (nb_frames > dts_error_threshold * 30) { - av_log(ost, AV_LOG_ERROR, "%"PRId64" frame duplication too large, skipping\n", nb_frames - 1); - ost->nb_frames_drop++; - return 0; - } - ost->nb_frames_dup += nb_frames - (nb_frames_prev && ost->last_dropped) - (nb_frames > nb_frames_prev); - av_log(ost, AV_LOG_VERBOSE, "*** %"PRId64" dup!\n", nb_frames - 1); - if (ost->nb_frames_dup > e->dup_warning) { - av_log(ost, AV_LOG_WARNING, "More than %"PRIu64" frames duplicated\n", e->dup_warning); - e->dup_warning *= 10; - } - } - ost->last_dropped = nb_frames == nb_frames_prev && frame; - ost->kf.dropped_keyframe = ost->last_dropped && frame && (frame->flags & AV_FRAME_FLAG_KEY); - /* duplicates frame if needed */ for (i = 0; i < nb_frames; i++) { AVFrame *in_picture;