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 4279B49193 for ; Fri, 5 Apr 2024 16:15:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4D6368D255; Fri, 5 Apr 2024 19:13:22 +0300 (EEST) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5730668D18A for ; Fri, 5 Apr 2024 19:13:10 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=OadrAsfW; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 1FEEF4D89 for ; Fri, 5 Apr 2024 18:13:07 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id iQk9cWF7HNNT for ; Fri, 5 Apr 2024 18:13:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712333582; bh=m+DRAjgQDkKxkGi+BL/Ov1vBvbvsyW0VESfDXyEVhSY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=OadrAsfWy/E+k8rGySfuFpCh40QcJfDTPF0WXvySH05bZn/FkDc442I3LF1+1Xfxo ryg+2e9XwePp3QT9ebtZDCnwVK3628od4owlwKQ5oiYLBWtmOEkeMghLnzozWoWlGk fIeXS4eL2B0A3lxCNoLGbFbe9dPyMtJhVTPtNDjQUFIYbQI1/9GON0bKAbPlF6jS+v H2a0rUBsFEbWrzjou18tjNWZmydt6ynj41T3/SKthscLwaIH5kegQtnCy1Ae0LWtkE iWu8WFEriX+KswShpENAYjIvXBxjRhumDXS6G3KE/8tzWaBfP6LOaQyhECJXPcZxi4 pN76QEf6bZXbQ== 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 CEA744D94 for ; Fri, 5 Apr 2024 18:13:02 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BC0033A18E7 for ; Fri, 5 Apr 2024 18:12:56 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 18:12:09 +0200 Message-ID: <20240405161212.26167-28-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240405161212.26167-1-anton@khirnov.net> References: <20240405161212.26167-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 28/31] fftools/ffmpeg_filter: change processing order in fg_finalise_bindings() 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: First bind all inputs in all filtergraphs, only then check that all outputs are bound. Needed by the following commit. --- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_filter.c | 33 ++++++++++++++++++++++++++------- fftools/ffmpeg_opt.c | 10 ++++------ 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 882d241bdb..885a7c0c10 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -724,7 +724,7 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost, char *graph_desc, Scheduler *sch, unsigned sch_idx_enc, const OutputFilterOptions *opts); -int fg_finalise_bindings(FilterGraph *fg); +int fg_finalise_bindings(void); /** * Get our axiliary frame data attached to the frame, allocating it diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 388c8919fd..1e14962f41 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1272,7 +1272,7 @@ static int fg_complex_bind_input(FilterGraph *fg, InputFilter *ifilter) return 0; } -int fg_finalise_bindings(FilterGraph *fg) +static int bind_inputs(FilterGraph *fg) { // bind filtergraph inputs to input streams for (int i = 0; i < fg->nb_inputs; i++) { @@ -1287,14 +1287,33 @@ int fg_finalise_bindings(FilterGraph *fg) return ret; } - for (int i = 0; i < fg->nb_outputs; i++) { - OutputFilter *output = fg->outputs[i]; - if (!output->bound) { - av_log(filtergraphs[i], AV_LOG_FATAL, - "Filter %s has an unconnected output\n", output->name); - return AVERROR(EINVAL); + return 0; +} + +int fg_finalise_bindings(void) +{ + int ret; + + for (int i = 0; i < nb_filtergraphs; i++) { + ret = bind_inputs(filtergraphs[i]); + if (ret < 0) + return ret; + } + + // check that all outputs were bound + for (int i = 0; i < nb_filtergraphs; i++) { + FilterGraph *fg = filtergraphs[i]; + + for (int j = 0; j < fg->nb_outputs; j++) { + OutputFilter *output = fg->outputs[j]; + if (!output->bound) { + av_log(filtergraphs[j], AV_LOG_FATAL, + "Filter %s has an unconnected output\n", output->name); + return AVERROR(EINVAL); + } } } + return 0; } diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index f764da1ed4..6526e8e3e8 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1264,12 +1264,10 @@ int ffmpeg_parse_options(int argc, char **argv, Scheduler *sch) } // bind unbound filtegraph inputs/outputs and check consistency - for (int i = 0; i < nb_filtergraphs; i++) { - ret = fg_finalise_bindings(filtergraphs[i]); - if (ret < 0) { - errmsg = "binding filtergraph inputs/outputs"; - goto fail; - } + ret = fg_finalise_bindings(); + if (ret < 0) { + errmsg = "binding filtergraph inputs/outputs"; + goto fail; } correct_input_start_times(); -- 2.43.0 _______________________________________________ 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".