From patchwork Sun May 24 01:04: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: 19826 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 67C7F449D53 for ; Sun, 24 May 2020 04:11:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47E2B6882F0; Sun, 24 May 2020 04:11:08 +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 8062B6805A5 for ; Sun, 24 May 2020 04:11:01 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id bg4so660921plb.3 for ; Sat, 23 May 2020 18:11:01 -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=00mBC02uOcfEJSH5LD/jKW2wcCCzjlZZTNpMijvOwhU=; b=Os7Ygd4KMQoQTdE5DB1IsKY/OoT193dv6WaLKMWvofvbA5QW+9FkMAf8xFDi23C8M8 A5F6EtfaVi/FY3WVSFE3YdLyf/ssnYsPRFy5VKyHFL9K8Hu5qsirP83gJNvFeotfKAke LmtC2WvuLyHibbsi2ORjV4ANgiNHLrT+d2JzM4aeV7eFIYZu1iw5tuOMQE9+x62kURW1 B5yrNfQB/GV41eyT7AJFGW7gJaMij7/DpEyQxmWiL8rItiTPJkQtF0j6zhkQrxcQi28C gN9YuE2FoWjgYaKLBhMaLg04n/u/SFUJXdUQPbnXVM/7dw2GzIu6wTJaB2nEw9UgSlPu pr+g== 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=00mBC02uOcfEJSH5LD/jKW2wcCCzjlZZTNpMijvOwhU=; b=QwHRgkzpNx8zmt5e4GHg5gI5JDtF9hUgiYAvNm4HrEFUSNiEUOzqxUDToKXarGsq+w jujPEj6j7dbzUFNBQhzIepRqp+MzxaLi+3czUFCXl1PWLwXqF8Ot9VPIoJjP9RU/O/eM 4wNlrOaz1jdZCeXbxaKakijgRnmmCcZ2Al+CRmJMR1H9YraBEOd/ehnxTajrenPwnWdH CCtwzYQg9zu3d7i6hx4IWR4VMyJ1t9EBfSL7fBXd66/AZgCHL5mbmMzduf3s+MvhqJ6y x9lxAnDy90NopHW79If1W+kCMl5aN89JpLqzWL2EpV4bOAXupHXCyEEe3Ug0pV7ZQHtD yDSQ== X-Gm-Message-State: AOAM530B1EogaiN01gDApMgkCr7GuxDE3H/vUKpNjyiFS9WnPIJcXwuM vGYiuRb5Lxw/ES+D+V3vMDLAquV/ X-Google-Smtp-Source: ABdhPJxdUIPSoVhyOBq39l0JK4mbXj3yhakSS6aT5kePQtx6YCu7IG2xHfqhC//K4DrXmDL7Tn+iNA== X-Received: by 2002:a17:90a:1642:: with SMTP id x2mr7377598pje.149.1590282659352; Sat, 23 May 2020 18:10:59 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id gg8sm9731693pjb.39.2020.05.23.18.10.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 May 2020 18:10:58 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 09:04:49 +0800 Message-Id: <1590282291-20859-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 v6 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..97d4f39 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 && !av_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; -}