From patchwork Sun May 24 00:42:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19823 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 68A2E44B375 for ; Sun, 24 May 2020 03:43:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E0BD6891FF; Sun, 24 May 2020 03:43:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1313680D52 for ; Sun, 24 May 2020 03:42:57 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id x10so5934413plr.4 for ; Sat, 23 May 2020 17:42:57 -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=JqO2GD5r+cZCHhIAZzT4kMl24ZLDnBgf0IUtOUgjIsE=; b=SrdK3I8k9UOd8m2qp6oMaAn7D/+Uw+iAZYaDNxfdC1Kgbq3eTFub8arQAXsxTlQhoa zr9l/JZWj9w5GFYBcB/ivGOTQZfY0SUj30bBt5gCE4dJ8QaGKf8Dupy+emMRhq+1bRyS vxj1Oi+TXIUd/a7FII/1MlcnZK1bWo4GykuLaFQrLlIsmUgy7C8FCB0Rwhii5GyJatG8 pz2ynHo880v9w30JRnLV65k9kOjhQ28XhTMQMyS+VkkjY+7s+/NGqmlQwkI25c170qh+ 32rVCnTddLHRakTMN6MACZ6sFAC4zovRdJccdlLyCaYvSOsbWiDnlTtcKspQYQw02ed8 Jofg== 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=JqO2GD5r+cZCHhIAZzT4kMl24ZLDnBgf0IUtOUgjIsE=; b=t9Ah6vpHrkzJLyty73akZ26Rp2jgjNwZrI1eNwYIoR4E/OHCNTy2RhJFwuIzNP5e+E vM0xw+0IIiTMRowNGfcr+bRrBYEAmc3nv16USyBEcYBN7Gny2m6TnqL/wVc8+XxR6bMn bcE7wma1AJAI5DRbHa9ZJ9XONN8CbWkLudoBnEFJ3BV70MtNeoxSKw6ekWjI6jssrPvn RafBf0IGeUkyvLfD8+OV2Uv5CpnmSB8QPAS6pZmcBSfM1Hli4/PvzVX+yjJAumwwERXI 5mdn50tmzEg/nNYezHp7OPN0+bDsyI/Mid9gtzbM6Ud7jP1UcK3EWdCwBf2MlDmtozIc 3nMA== X-Gm-Message-State: AOAM533o2JMX9BhS91twigS4Bp2jWKXCuTfQoQ6I2xWXiBCGOtx7nAhb nhNrvcMH5bTVg0jlW4JbJ2MZDWze X-Google-Smtp-Source: ABdhPJwA2imxZh3bAvit8xt9TgHzC+PxCyWkQKk/WFzUNV2PNkxZGA0EKL1Dw1GhrtAFhiuLs+ZjBQ== X-Received: by 2002:a17:90a:690f:: with SMTP id r15mr13327353pjj.65.1590280975424; Sat, 23 May 2020 17:42:55 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n3sm671975pgq.30.2020.05.23.17.42.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 May 2020 17:42:54 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 08:42:48 +0800 Message-Id: <1590280970-16256-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589900073-4183-1-git-send-email-lance.lmwang@gmail.com> References: <1589900073-4183-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 1/3] avfilter/graphdump: support for the graph2dot function 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 reuse the function from tools/graph2dot.c and add support for filter graph with graphviz DOT format for avfilter directly. So tools/graph2dot.c is duplicated and can be removed. In addition, make the options are pair-key format, now it support two key: fmt=DOT|dot filename=./outfile Signed-off-by: Limin Wang --- libavfilter/graphdump.c | 89 +++++++++++++++++++++ tools/graph2dot.c | 204 ------------------------------------------------ 2 files changed, 89 insertions(+), 204 deletions(-) delete mode 100644 tools/graph2dot.c diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c index 79ef1a7..c7298e3 100644 --- a/libavfilter/graphdump.c +++ b/libavfilter/graphdump.c @@ -151,15 +151,104 @@ static void avfilter_graph_dump_to_buf(AVBPrint *buf, AVFilterGraph *graph) } } +static void avfilter_graph2dot_to_buf(AVBPrint *buf, AVFilterGraph *graph) +{ + int i, j; + + av_bprintf(buf, "digraph G {\n"); + av_bprintf(buf, "node [shape=box]\n"); + av_bprintf(buf, "rankdir=LR\n"); + + for (i = 0; i < graph->nb_filters; i++) { + char filter_ctx_label[128]; + const AVFilterContext *filter_ctx = graph->filters[i]; + + snprintf(filter_ctx_label, sizeof(filter_ctx_label), "%s\\n(%s)", + filter_ctx->name, + filter_ctx->filter->name); + + for (j = 0; j < filter_ctx->nb_outputs; j++) { + AVFilterLink *link = filter_ctx->outputs[j]; + if (link) { + char dst_filter_ctx_label[128]; + const AVFilterContext *dst_filter_ctx = link->dst; + + snprintf(dst_filter_ctx_label, sizeof(dst_filter_ctx_label), + "%s\\n(%s)", + dst_filter_ctx->name, + dst_filter_ctx->filter->name); + + av_bprintf(buf, "\"%s\" -> \"%s\" [ label= \"inpad:%s -> outpad:%s\\n", + filter_ctx_label, dst_filter_ctx_label, + avfilter_pad_get_name(link->srcpad, 0), + avfilter_pad_get_name(link->dstpad, 0)); + + if (link->type == AVMEDIA_TYPE_VIDEO) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); + av_bprintf(buf, + "fmt:%s w:%d h:%d tb:%d/%d", + desc->name, + link->w, link->h, + link->time_base.num, link->time_base.den); + } else if (link->type == AVMEDIA_TYPE_AUDIO) { + char audio_buf[255]; + av_get_channel_layout_string(audio_buf, sizeof(audio_buf), -1, + link->channel_layout); + av_bprintf(buf, + "fmt:%s sr:%d cl:%s tb:%d/%d", + av_get_sample_fmt_name(link->format), + link->sample_rate, audio_buf, + link->time_base.num, link->time_base.den); + } + av_bprintf(buf, "\" ];\n"); + } + } + } + av_bprintf(buf, "}\n"); +} + char *avfilter_graph_dump(AVFilterGraph *graph, const char *options) { AVBPrint buf; char *dump = NULL; + int ret; + AVDictionary *dict = NULL; + AVDictionaryEntry *format = NULL; + AVDictionaryEntry *filename = NULL; + + ret = av_dict_parse_string(&dict, options, "=", ":", 0); + if (ret < 0) { + av_dict_free(&dict); + return NULL; + } + format = av_dict_get(dict, "fmt", NULL, 0); + if (format && !strcasecmp(format->value, "DOT")) { + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); + avfilter_graph2dot_to_buf(&buf, graph); + av_bprint_finalize(&buf, &dump); + } else { av_bprint_init(&buf, 0, AV_BPRINT_SIZE_COUNT_ONLY); avfilter_graph_dump_to_buf(&buf, graph); av_bprint_init(&buf, buf.len + 1, buf.len + 1); avfilter_graph_dump_to_buf(&buf, graph); av_bprint_finalize(&buf, &dump); + } + + if (filename = av_dict_get(dict, "filename", NULL, 0)) { + FILE* file = fopen(filename->value, "w"); + if (!file) { + av_log(graph, AV_LOG_ERROR, "failed to open: %s \n", filename->value); + av_freep(&dump); + return NULL; + } + if (dump) { + fputs(dump, file); + fflush(file); + fclose(file); + } + } + + av_dict_free(&dict); return dump; } diff --git a/tools/graph2dot.c b/tools/graph2dot.c deleted file mode 100644 index d5c1e4e..0000000 --- a/tools/graph2dot.c +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (c) 2008-2010 Stefano Sabatini - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "config.h" -#if HAVE_UNISTD_H -#include /* getopt */ -#endif -#include -#include - -#include "libavutil/channel_layout.h" -#include "libavutil/mem.h" -#include "libavutil/pixdesc.h" -#include "libavfilter/avfilter.h" - -#if !HAVE_GETOPT -#include "compat/getopt.c" -#endif - -static void usage(void) -{ - printf("Convert a libavfilter graph to a dot file.\n"); - printf("Usage: graph2dot [OPTIONS]\n"); - printf("\n" - "Options:\n" - "-i INFILE set INFILE as input file, stdin if omitted\n" - "-o OUTFILE set OUTFILE as output file, stdout if omitted\n" - "-h print this help\n"); -} - -struct line { - char data[256]; - struct line *next; -}; - -static void print_digraph(FILE *outfile, AVFilterGraph *graph) -{ - int i, j; - - fprintf(outfile, "digraph G {\n"); - fprintf(outfile, "node [shape=box]\n"); - fprintf(outfile, "rankdir=LR\n"); - - for (i = 0; i < graph->nb_filters; i++) { - char filter_ctx_label[128]; - const AVFilterContext *filter_ctx = graph->filters[i]; - - snprintf(filter_ctx_label, sizeof(filter_ctx_label), "%s\\n(%s)", - filter_ctx->name, - filter_ctx->filter->name); - - for (j = 0; j < filter_ctx->nb_outputs; j++) { - AVFilterLink *link = filter_ctx->outputs[j]; - if (link) { - char dst_filter_ctx_label[128]; - const AVFilterContext *dst_filter_ctx = link->dst; - - snprintf(dst_filter_ctx_label, sizeof(dst_filter_ctx_label), - "%s\\n(%s)", - dst_filter_ctx->name, - dst_filter_ctx->filter->name); - - fprintf(outfile, "\"%s\" -> \"%s\" [ label= \"inpad:%s -> outpad:%s\\n", - filter_ctx_label, dst_filter_ctx_label, - avfilter_pad_get_name(link->srcpad, 0), - avfilter_pad_get_name(link->dstpad, 0)); - - if (link->type == AVMEDIA_TYPE_VIDEO) { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); - fprintf(outfile, - "fmt:%s w:%d h:%d tb:%d/%d", - desc->name, - link->w, link->h, - link->time_base.num, link->time_base.den); - } else if (link->type == AVMEDIA_TYPE_AUDIO) { - char buf[255]; - av_get_channel_layout_string(buf, sizeof(buf), -1, - link->channel_layout); - fprintf(outfile, - "fmt:%s sr:%d cl:%s tb:%d/%d", - av_get_sample_fmt_name(link->format), - link->sample_rate, buf, - link->time_base.num, link->time_base.den); - } - fprintf(outfile, "\" ];\n"); - } - } - } - fprintf(outfile, "}\n"); -} - -int main(int argc, char **argv) -{ - const char *outfilename = NULL; - const char *infilename = NULL; - FILE *outfile = NULL; - FILE *infile = NULL; - char *graph_string = NULL; - AVFilterGraph *graph = av_mallocz(sizeof(AVFilterGraph)); - char c; - - av_log_set_level(AV_LOG_DEBUG); - - while ((c = getopt(argc, argv, "hi:o:")) != -1) { - switch (c) { - case 'h': - usage(); - return 0; - case 'i': - infilename = optarg; - break; - case 'o': - outfilename = optarg; - break; - case '?': - return 1; - } - } - - if (!infilename || !strcmp(infilename, "-")) - infilename = "/dev/stdin"; - infile = fopen(infilename, "r"); - if (!infile) { - fprintf(stderr, "Failed to open input file '%s': %s\n", - infilename, strerror(errno)); - return 1; - } - - if (!outfilename || !strcmp(outfilename, "-")) - outfilename = "/dev/stdout"; - outfile = fopen(outfilename, "w"); - if (!outfile) { - fprintf(stderr, "Failed to open output file '%s': %s\n", - outfilename, strerror(errno)); - return 1; - } - - /* read from infile and put it in a buffer */ - { - int64_t count = 0; - struct line *line, *last_line, *first_line; - char *p; - last_line = first_line = av_malloc(sizeof(struct line)); - if (!last_line) { - fprintf(stderr, "Memory allocation failure\n"); - return 1; - } - - while (fgets(last_line->data, sizeof(last_line->data), infile)) { - struct line *new_line = av_malloc(sizeof(struct line)); - if (!new_line) { - fprintf(stderr, "Memory allocation failure\n"); - return 1; - } - count += strlen(last_line->data); - last_line->next = new_line; - last_line = new_line; - } - last_line->next = NULL; - - graph_string = av_malloc(count + 1); - if (!graph_string) { - fprintf(stderr, "Memory allocation failure\n"); - return 1; - } - p = graph_string; - for (line = first_line; line->next; line = line->next) { - size_t l = strlen(line->data); - memcpy(p, line->data, l); - p += l; - } - *p = '\0'; - } - - if (avfilter_graph_parse(graph, graph_string, NULL, NULL, NULL) < 0) { - fprintf(stderr, "Failed to parse the graph description\n"); - return 1; - } - - if (avfilter_graph_config(graph, NULL) < 0) - return 1; - - print_digraph(outfile, graph); - fflush(outfile); - - return 0; -} From patchwork Sun May 24 00:42:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19824 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 3315A44B375 for ; Sun, 24 May 2020 03:43:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2150A6880B4; Sun, 24 May 2020 03:43:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 236D968806F for ; Sun, 24 May 2020 03:42:59 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id d10so6821596pgn.4 for ; Sat, 23 May 2020 17:42:59 -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=/+cepVmOvtv95ANPVBmrBD0mj29jR/ycxYs+PCTHTXw=; b=Ix+YWHMK8fBCOihGxZOCkLz2jHgt+iLu9/MzFLcUYbMxVMbDeBgSVKi2DPEXc5zAAi zC9Ad8sn/iw+j3pCmViW/nK+5tpL82KFStdhhhJF054hYvjH1vswravDdurMcYdEz3G7 5Ssiqj1fEeHe8tz0MOZWB5I2bZiPbRr1lsZXz3iybjIm/acj6l4WCmRsuXkK0iWyHDqA 2zur6ebLE54aHKZeU4rr2mpl9RQJKvmHojyTQ+4+8jErr+gjRpOC5KV8s4BD4xdHlKOr cHN4axyxvYuOx7qvi60NVH+SrOV+j5dLorH/9LED94Tq6lQ6tHXZMAfLd4kVWT+HHnOw JBsw== 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=/+cepVmOvtv95ANPVBmrBD0mj29jR/ycxYs+PCTHTXw=; b=Vu/OV62UTGckqMy51n+5xaix2hg/gC/t9bv/RweJ27vdS1a07Mi/kllOIeKQbUmi0T 9RhrDOdlvAyRKz77+xiM6NDERrQw0Qg98cPKGM0MGBM4YhiOhUBn93JjApEgGETMGICt TVmg1ZceOfvXoEUg1YHQf69AzdFife6BWQiZjwU2iB59snjxo1HKkJETjd7vMJc4Pxrd VnNu0vFPDXzU55HKOVfTRPJixtQ+AmMd5v+u4fwTJGiCt/9CuvVWpc1SIpGnd2O98xvF La1Hmepw2/XYtGVwUJSkb0BPW7/mw7TfvtwhQ4Epa60HRlOuyMcNxydnZcPEPoJuKPMn q7yg== X-Gm-Message-State: AOAM533QPmF4rJ5lqxRgwZtPjvF2Wc1t8y56txooRblMBO4h5m4xJpH+ Ugsvx8YN07BSEN73C4la7yHaZqHc X-Google-Smtp-Source: ABdhPJwPJDBTD9eWddP/bc3BftMFpGa6KNGY6JI/6i8GT8Wi6L7oy6xLdGhngLEPmaYKzI2IA7sXkA== X-Received: by 2002:a62:3383:: with SMTP id z125mr10585045pfz.271.1590280976936; Sat, 23 May 2020 17:42:56 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n3sm671975pgq.30.2020.05.23.17.42.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 May 2020 17:42:56 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 08:42:49 +0800 Message-Id: <1590280970-16256-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590280970-16256-1-git-send-email-lance.lmwang@gmail.com> References: <1589900073-4183-1-git-send-email-lance.lmwang@gmail.com> <1590280970-16256-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 2/3] avdevice/lavfi: support the dumpgraph with options 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/indevs.texi | 15 +++++++++++++-- libavdevice/lavfi.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 6f5afaf..7ec7062 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -973,8 +973,13 @@ Set the filename of the filtergraph to be read and sent to the other filters. Syntax of the filtergraph is the same as the one specified by the option @var{graph}. -@item dumpgraph -Dump graph to stderr. +@item dumpgraph @var{options} +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}. @end table @@ -988,6 +993,12 @@ ffplay -f lavfi -graph "color=c=pink [out0]" dummy @end example @item +dump the filter graph with graphviz DOT output format to ./test.tmp +@example +ffplay -dumpgraph fmt=dot:filename=./test.tmp -f lavfi color=c=pink +@end example + +@item As the previous example, but use filename for specifying the graph description, and omit the "out0" label: @example diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index c949ff7..fa75fde 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -493,7 +493,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) static const AVOption options[] = { { "graph", "set libavfilter graph", OFFSET(graph_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "graph_file","set libavfilter graph filename", OFFSET(graph_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC}, - { "dumpgraph", "dump graph to stderr", OFFSET(dump_graph), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, + { "dumpgraph", "dump graph to stderr with more options", OFFSET(dump_graph), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { NULL }, }; From patchwork Sun May 24 00:42:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19825 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 39AD944B375 for ; Sun, 24 May 2020 03:43:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 247C468A0D1; Sun, 24 May 2020 03:43:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8EA46804B3 for ; Sun, 24 May 2020 03:43:00 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id z15so3028546pjb.0 for ; Sat, 23 May 2020 17:43:00 -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=QbaMRylr6UC91SkZiiTmhotLEhoVCt8p1DnrSE1ZkFbYf6xUcII9dPQBz3yrexTCi4 RqptWxlwIX8H13OtLce24SZ3zOltKWWd1LC3f9YLr9tNPyzg5NOoa8YCqsFeZEXprHM5 JLZqb0mlIbQmurp5yjU0OomC8kthHCijJTnp8ZMUO+rbOhDKYh8mlfcJKWUA/Y/cSEaU AMCjK2zZ+9rYZYWi01Rt59717cr7w3k0dVF3psLAkIlS+xhDT/pvDndGDl/BSKZJ045P j4DgxWIO0gB+pKZk77iRJ2QdgraylQbNRpnetIlkY8drWnbhpMmCzC8PdLHjujmsrr74 I84Q== 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=GZ6Q5Xtsg+ssRheEXaXW/4Mz2SuNjDr6iVn894vCEFJjms9qFPYF+h/nf+OPf9/z/q S7tWvYY5BYug0nfo21dyHpoR7Uy//rvXncBmGDmca9kIBfv9CAzPj//Wbr0kz1sHwxRh C1MMUilqQZZzl5ANYacjrzPwJqVMBGXUtS96Zby1b2YQ34r7AxXTwX50ZSSKe2U/k6Ey xXqCDfeG6fXhXX7egtd3zoG0qboAWTl62n9ErIX4eXZ0N8R2l71QKCyUspNco3IWisq2 H0Unb7oiqF++ipUhMDhslo2/xMokuS4QlncH83HzU+tAo5o5v/ZJ9d1BGtv6iGsOadW2 HX0Q== X-Gm-Message-State: AOAM530zpGzAYc1WusIXb097W+w6pTv08br5ixCY2GPQYAkK7FxEPePw LBiogUWJmdYPPlqpevWNdBS88XHd X-Google-Smtp-Source: ABdhPJyqOIQvaPW1mTDrI8TKGeENZmxmgDqJdh8exhYyeZ6ZnBtNBFg5MDkLANiAhYSU5SECwXmMlg== X-Received: by 2002:a17:90a:e38c:: with SMTP id b12mr13504588pjz.227.1590280978583; Sat, 23 May 2020 17:42:58 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n3sm671975pgq.30.2020.05.23.17.42.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 May 2020 17:42:58 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 08:42:50 +0800 Message-Id: <1590280970-16256-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590280970-16256-1-git-send-email-lance.lmwang@gmail.com> References: <1589900073-4183-1-git-send-email-lance.lmwang@gmail.com> <1590280970-16256-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 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 },