From patchwork Wed Nov 20 14:54:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16350 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CE48844944A for ; Wed, 20 Nov 2019 17:02:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABC4568A89E; Wed, 20 Nov 2019 17:02:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DE7768A89E for ; Wed, 20 Nov 2019 17:02:52 +0200 (EET) Received: by mail-pf1-f194.google.com with SMTP id x28so14360478pfo.6 for ; Wed, 20 Nov 2019 07:02:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=iQ+ZED/2Y6qXUi4ahZupiWaIuncj7rbbdU1VU31P4s4=; b=S3jagnklKKaSLsu/joYP7cHtpLw5CcwhzojjXbdPdIe48lVQ6JGOfabNFCY7z7bYiK bwZum7rgQFWisJQNZsSiFton23Xnvy0VsBnvuS78xkjWUVbfT0pOkWKN5E2FIsDCkA9K 1XhNrgLTEK+1syTq9gX+scXFs7zl2yPo2wVz0BSd506eI/86F4crscgqqUIMsoF+9fo6 V1XwQTl92CJ8RQHTv9vl1cw/x2V/3M+QRAjRGsCIR1Hf8gu+OXbNkJG5u6xJTDHFKrgs wzjPNTPc3dV3TQJ1QviORgQZbId9jsitudh50KmuXPep2f6EG26Xkj0vURWGWfnPrJT6 VRPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iQ+ZED/2Y6qXUi4ahZupiWaIuncj7rbbdU1VU31P4s4=; b=FhsA+JXFgyWgmk5B5n4NMmULP20rVflnuzXPaLJ3/pMpbM0DB13ddoK/+La6toa2qL q7jNofsFzVBA9j7VfqHpJAGsJrMZ0dLZ1QxsD1hx68RL6B/p1vNjRXHRLzkp/qyzzAun pUD6Y9VQ8GIF4CMQpk6nH4uBGnp5HGUJ0Nb82JD3vncT3S997Q7oJoJ9ClF7Zm6TRb5L zz9PcxQBxyfd2APJB7sIZnoEF66rdsxjFc5TcJGGEcoU83yPmxJOSlNlfTfZinJLE0+5 o+6X8AmPULbpaflikzlBKS61ft4BlLGRqMVa39FU2NJ/qwcc0jlobrmm4SPaduN4zn5c RL/Q== X-Gm-Message-State: APjAAAVitQq2ZM+vcHS8cpHpqFY+V3SVnorNxX3cOfZCYIZkhutjjmPd cl3Xl/+wwcFNiKhQVG52eEJ47cOU X-Google-Smtp-Source: APXvYqx4I5Lz9ygfXRJdWAEPGo7RZfUe16qEPNDd3f1FEDAeTzWqiPYb88IhQMZ/G2cv2oR7hkozPg== X-Received: by 2002:a62:ce41:: with SMTP id y62mr4567485pfg.34.1574261700461; Wed, 20 Nov 2019 06:55:00 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j21sm29951234pfa.58.2019.11.20.06.54.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Nov 2019 06:54:59 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Nov 2019 22:54:55 +0800 Message-Id: <20191120145456.20251-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/2] fftools: add global option to dump filter graph to stderr X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang It's useful for debugging filter graph purposes, now only lavfi can do that. Signed-off-by: Limin Wang --- doc/ffmpeg.texi | 4 ++++ fftools/ffmpeg.h | 1 + fftools/ffmpeg_filter.c | 7 +++++++ fftools/ffmpeg_opt.c | 3 +++ 4 files changed, 15 insertions(+) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 9cccc2337d..7e55f67898 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -668,6 +668,10 @@ Defines how many threads are used to process a filter pipeline. Each pipeline will produce a thread pool with this many threads available for parallel processing. The default is the number of available CPUs. +@item -filter_dumpgraph (@emph{global}) +Dump filter graph to stderr. It is off by default, the option is mostly useful +for debugging filter graph purposes + @item -pre[:@var{stream_specifier}] @var{preset_name} (@emph{output,per-stream}) Specify the preset for matching stream(s). diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 7b6f802082..b3133e7e99 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -608,6 +608,7 @@ extern float max_error_rate; extern char *videotoolbox_pixfmt; extern int filter_nbthreads; +extern int filter_dumpgraph; extern int filter_complex_nbthreads; extern int vstats_version; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 72838de1e2..35ba3a38db 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1109,6 +1109,13 @@ int configure_filtergraph(FilterGraph *fg) if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0) goto fail; + if (filter_dumpgraph) { + char *dump = avfilter_graph_dump(fg->graph, NULL); + fputs(dump, stderr); + fflush(stderr); + av_free(dump); + } + /* limit the lists of allowed formats to the ones selected, to * make sure they stay the same if the filtergraph is reconfigured later */ for (i = 0; i < fg->nb_outputs; i++) { diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 71063cc443..44eb890e86 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -110,6 +110,7 @@ int frame_bits_per_raw_sample = 0; float max_error_rate = 2.0/3; int filter_nbthreads = 0; int filter_complex_nbthreads = 0; +int filter_dumpgraph = 0; int vstats_version = 2; @@ -3523,6 +3524,8 @@ const OptionDef options[] = { "create a complex filtergraph", "graph_description" }, { "filter_complex_threads", HAS_ARG | OPT_INT, { &filter_complex_nbthreads }, "number of threads for -filter_complex" }, + { "filter_dumpgraph", OPT_BOOL, { &filter_dumpgraph }, + "dump filter graph to stderr" }, { "lavfi", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex }, "create a complex filtergraph", "graph_description" }, { "filter_complex_script", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex_script },