From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1674043792 for ; Fri, 27 Jan 2023 13:17:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A29B68BDCB; Fri, 27 Jan 2023 15:17:32 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F69468B2C3 for ; Fri, 27 Jan 2023 15:17:24 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 64D1E240591 for ; Fri, 27 Jan 2023 14:17:23 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id r351XF8p2Gmm for ; Fri, 27 Jan 2023 14:17:22 +0100 (CET) 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 C33D1240178 for ; Fri, 27 Jan 2023 14:17:22 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 208E23A034C for ; Fri, 27 Jan 2023 14:17:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Jan 2023 14:16:39 +0100 Message-Id: <20230127131639.4928-4-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230127131639.4928-1-anton@khirnov.net> References: <20230127131639.4928-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavfi/framesync: reindent after previous commit 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavfilter/framesync.c | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index b52cf318c0..9986b04e48 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -368,35 +368,35 @@ static int framesync_advance(FFFrameSync *fs) } pts = fs->in[0].pts; } else { - pts = INT64_MAX; - for (i = 0; i < fs->nb_in; i++) - if (fs->in[i].have_next && fs->in[i].pts_next < pts) - pts = fs->in[i].pts_next; - if (pts == INT64_MAX) { - framesync_eof(fs); - break; - } - for (i = 0; i < fs->nb_in; i++) { - FFFrameSyncIn * const in = &fs->in[i]; - - if (in->pts_next == pts || - (in->ts_mode == TS_NEAREST && in->have_next && - in->pts_next != INT64_MAX && in->pts != AV_NOPTS_VALUE && - in->pts_next - pts < pts - in->pts) || - (in->before == EXT_INFINITY && in->state == STATE_BOF)) { - frame_advance(in); - in->state = in->frame ? STATE_RUN : STATE_EOF; - if (in->sync == fs->sync_level && in->frame) - fs->frame_ready = 1; - if (in->state == STATE_EOF && in->after == EXT_STOP) - framesync_eof(fs); - } - } - if (fs->frame_ready) + pts = INT64_MAX; for (i = 0; i < fs->nb_in; i++) - if ((fs->in[i].state == STATE_BOF && - fs->in[i].before == EXT_STOP)) - fs->frame_ready = 0; + if (fs->in[i].have_next && fs->in[i].pts_next < pts) + pts = fs->in[i].pts_next; + if (pts == INT64_MAX) { + framesync_eof(fs); + break; + } + for (i = 0; i < fs->nb_in; i++) { + FFFrameSyncIn * const in = &fs->in[i]; + + if (in->pts_next == pts || + (in->ts_mode == TS_NEAREST && in->have_next && + in->pts_next != INT64_MAX && in->pts != AV_NOPTS_VALUE && + in->pts_next - pts < pts - in->pts) || + (in->before == EXT_INFINITY && in->state == STATE_BOF)) { + frame_advance(in); + in->state = in->frame ? STATE_RUN : STATE_EOF; + if (in->sync == fs->sync_level && in->frame) + fs->frame_ready = 1; + if (in->state == STATE_EOF && in->after == EXT_STOP) + framesync_eof(fs); + } + } + if (fs->frame_ready) + for (i = 0; i < fs->nb_in; i++) + if ((fs->in[i].state == STATE_BOF && + fs->in[i].before == EXT_STOP)) + fs->frame_ready = 0; } fs->pts = pts; } -- 2.35.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".