[FFmpeg-devel] [PATCH] In graph2dot, print more specific audio information for audio links.

[Janne Grunau]

On Mon, Feb 14, 2011 at 11:08:20AM +0100, Stefano Sabatini wrote:
> From 9cfad75132015a29c4f574de0ca5193b1988c538 Mon Sep 17 00:00:00 2001
> From: Stefano Sabatini <stefano.sabatini-lala at poste.it>
> Date: Sun, 13 Feb 2011 22:50:47 +0100
> Subject: [PATCH] In graph2dot, print more specific audio information for audio links.
> 
> ---
>  tools/graph2dot.c |   17 +++++++++++++----
>  1 files changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/graph2dot.c b/tools/graph2dot.c
> index 5e0da9a..3428c93 100644
> --- a/tools/graph2dot.c
> +++ b/tools/graph2dot.c
> @@ -22,6 +22,7 @@
>  
>  #undef HAVE_AV_CONFIG_H
>  #include "libavutil/pixdesc.h"
> +#include "libavcore/audioconvert.h"

changed to libavutil

>  #include "libavfilter/avfiltergraph.h"
>  
>  static void usage(void)
> @@ -67,10 +68,18 @@ static void print_digraph(FILE *outfile, AVFilterGraph *graph)
>                           dst_filter_ctx->filter->name);
>  
>                  fprintf(outfile, "\"%s\" -> \"%s\"", filter_ctx_label, dst_filter_ctx_label);
> -                fprintf(outfile, " [ label= \"fmt:%s w:%d h:%d tb:%d/%d\" ];\n",
> -                        link->type == AVMEDIA_TYPE_VIDEO ? av_pix_fmt_descriptors[link->format].name :
> -                        link->type == AVMEDIA_TYPE_AUDIO ? av_get_sample_fmt_name(link->format) : "unknown",
> -                        link->w, link->h, link->time_base.num, link->time_base.den);
> +                if (link->type == AVMEDIA_TYPE_VIDEO) {
> +                    fprintf(outfile, " [ label= \"fmt:%s w:%d h:%d tb:%d/%d\" ]",
> +                            av_pix_fmt_descriptors[link->format].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, " [ label= \"fmt:%s sr:%"PRId64" cl:%s\" ]",
> +                            av_get_sample_fmt_name(link->format),
> +                            link->sample_rate, buf);
> +                }
> +                fprintf(outfile, ";\n");
>              }
>          }
>      }

ok and queued

Janne