From patchwork Sun May 24 23:50:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19841 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 A222C44AF1D for ; Mon, 25 May 2020 02:50:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DE5C689247; Mon, 25 May 2020 02:50:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA0F86891FF for ; Mon, 25 May 2020 02:50:37 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id x11so5836674plv.9 for ; Sun, 24 May 2020 16:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+VbZdfG8Bm4OlOL9m5umwAE+zi5t/nX5Bzd2M15k5bk=; b=feujVuKq0Qf4VXvAcl6QYfQvO5KsF+k0uYUNe+LZrK/AfkkPeKek2OQtg7leljp3N1 2vd0TnO7exdsqvKJdNT/RNTw1gmYzlvDzA4Ep1CIWEjtTW+fGHnjYIIR9AqosJk4zpv2 fy8pA+jifzIEUxtj5Okyyd1MYXQLAdf0nxvTXLLPeboYWLBPZOZ0pUfjJDujtTDqGQIm JIxE2kVJuRmKnD1IWxtn2Y9apARI6T0K2m9WU6umkO2/rqLwQFPSc+waQQWN57MGW676 qYLwYKNwH+eFBaMwpQUFQ0olkaIZajEbt4d/hu/G9FkpBPnn6ddPMFeYKmtlNB/SY/QI AGYQ== 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:in-reply-to :references; bh=+VbZdfG8Bm4OlOL9m5umwAE+zi5t/nX5Bzd2M15k5bk=; b=TxnMEnsDw1re6Q5LmA77kekI9aJyxKOI+Voxk6s0IBsgeIkDolVg3uI27EEc4RW1Ak Olbgt8piiAvVLJy5xJ8jSj0wXW+Kwvh0sAqlZRCqEo9jG7EILwMWIikhTshSXPWyP+6C 8GvvGOz5lDoov3llZqyL3Cb1tzuHM49LfXhvlyA447DJf3UKYtsceHBkgGdBdPLb+R4/ pitkvJxPnrG2aDKhxSGOD7kSvsvoybGk47V85mLbl1NdPHtCsvpY0PsFwhAYy+h8CTU8 Xa2C/5wapSl1awlG/Ct0ncZ0/gdKyXjrD/vVfddfb+5la9l9a17vYZJiH24dDp+gDEU9 vfsA== X-Gm-Message-State: AOAM533SqtcJvvDzvY9dopqpgZdCVEf7lMQq5bqHZkzIk8IoW7jFmpvY StGBhtPzDz891JAo3yfK8LxoORFh X-Google-Smtp-Source: ABdhPJz4VFHB7dqybYPkktXydf4OMbJvJSZyzq+YyA5n6HF+2G3xbdZtO0WRSSA/5h+l6tqqxuofEA== X-Received: by 2002:a17:90a:c385:: with SMTP id h5mr17862200pjt.147.1590364235371; Sun, 24 May 2020 16:50:35 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id e19sm11251525pfn.17.2020.05.24.16.50.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 May 2020 16:50:34 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 May 2020 07:50:26 +0800 Message-Id: <1590364226-11567-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590364226-11567-1-git-send-email-lance.lmwang@gmail.com> References: <1589900073-4183-1-git-send-email-lance.lmwang@gmail.com> <1590364226-11567-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v7 3/3] fftools: add options to dump filter graph 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 Signed-off-by: Limin Wang --- doc/ffmpeg.texi | 12 ++++++++++++ fftools/ffmpeg.c | 1 + fftools/ffmpeg.h | 1 + fftools/ffmpeg_filter.c | 11 +++++++++++ fftools/ffmpeg_opt.c | 10 ++++++++++ 5 files changed, 35 insertions(+) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index ed437bb..c7dd73b 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -735,6 +735,18 @@ Technical note -- attachments are implemented as codec extradata, so this option can actually be used to extract extradata from any stream, not just attachments. +@item dump_filtergraph @var{options} (@emph{global}) +Dump graph to stderr with more options + +options is a ':'-separated list of @var{key=value} pairs. + +Set the graph with graphviz DOT format by @var{fmt=dot|DOT}, +set the filename of filtergraph to output by @var{filename=path}. + +@example +ffmpeg -dump_filtergraph fmt=dot:filename=./test.tmp -i INPUT +@end example + @item -noautorotate Disable automatically rotating video based on file metadata. diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index f697460..2c611a7 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -625,6 +625,7 @@ static void ffmpeg_cleanup(int ret) av_err2str(AVERROR(errno))); } av_freep(&vstats_filename); + av_freep(&dump_filtergraph); av_freep(&input_streams); av_freep(&input_files); diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 38205a1..000c682 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -578,6 +578,7 @@ extern int nb_filtergraphs; extern char *vstats_filename; extern char *sdp_filename; +extern char *dump_filtergraph; extern float audio_drift_threshold; extern float dts_delta_threshold; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 8b5b157..c5adfae 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1106,6 +1106,17 @@ int configure_filtergraph(FilterGraph *fg) if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0) goto fail; + if (dump_filtergraph) { + char *dump = avfilter_graph_dump(fg->graph, dump_filtergraph); + if (!dump) { + ret = AVERROR(ENOMEM); + goto fail; + } + 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 60bb437..e4ebc88 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -143,6 +143,7 @@ HWDevice *filter_hw_device; char *vstats_filename; char *sdp_filename; +char *dump_filtergraph; float audio_drift_threshold = 0.1; float dts_delta_threshold = 10; @@ -2914,6 +2915,13 @@ static int opt_vstats_file(void *optctx, const char *opt, const char *arg) return 0; } +static int opt_dumpgraph(void *optctx, const char *opt, const char *arg) +{ + av_free (dump_filtergraph); + dump_filtergraph = av_strdup(arg); + return 0; +} + static int opt_vstats(void *optctx, const char *opt, const char *arg) { char filename[40]; @@ -3548,6 +3556,8 @@ const OptionDef options[] = { { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(dump_attachment) }, "extract an attachment into a file", "filename" }, + { "dump_filtergraph",HAS_ARG | OPT_EXPERT, { .func_arg = opt_dumpgraph }, + "dump filter graph to stderr with options"}, { "stream_loop", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_INPUT | OPT_OFFSET, { .off = OFFSET(loop) }, "set number of times input stream shall be looped", "loop count" }, { "debug_ts", OPT_BOOL | OPT_EXPERT, { &debug_ts },