[FFmpeg-devel] [PATCH] ffprobe: generalize writer subsection nesting model

Stefano Sabatini stefasab at gmail.com
Tue Sep 18 00:38:39 CEST 2012


Discard unflexible structure based on the root/chapter/section structure
in favor of a generalized concept of section.

This should allow to represent sections at generic level of nesting, and
allow subsections printing selection.

Also, slightly simplify the code.
---
 ffprobe.c |  515 +++++++++++++++++++++++++++++--------------------------------
 1 files changed, 242 insertions(+), 273 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index a0aee83..d198f90 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -28,6 +28,7 @@
 
 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
+#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/opt.h"
@@ -66,6 +67,40 @@ static int show_private_data            = 1;
 
 static char *print_format;
 
+/* section structure definition */
+
+struct section {
+    const char *name;
+    int flags;
+};
+
+#define SECTION_FLAG_IS_WRAPPER 1 ///< the section only contains other sections, but has no internal data
+#define SECTION_FLAG_IS_ARRAY   2 ///< the section contains an array of elements of the same type
+
+struct section root_section = { "root", 1 };
+
+struct section packets_and_frames_section = { "packets_and_frames", SECTION_FLAG_IS_ARRAY };
+
+struct section frames_section = { "frames", SECTION_FLAG_IS_ARRAY };
+struct section frame_section = { "frame", 0 };
+struct section frame_tags_section = { "tags", SECTION_FLAG_IS_ARRAY };
+
+struct section packets_section = { "packets", SECTION_FLAG_IS_ARRAY };
+struct section packet_section = { "packet", 0 };
+
+struct section error_section = { "error", 0 };
+
+struct section format_section = { "format", 0 };
+struct section format_tags_section = { "tags", SECTION_FLAG_IS_ARRAY };
+
+struct section library_versions_section = { "library_versions", SECTION_FLAG_IS_ARRAY };
+struct section library_version_section = { "library_version", 0 };
+struct section program_version_section = { "program_version", 0 };
+
+struct section streams_section = { "streams", SECTION_FLAG_IS_ARRAY };
+struct section stream_section = { "stream", 0 };
+struct section stream_tags_section = { "tags", SECTION_FLAG_IS_ARRAY };
+
 static const OptionDef *options;
 
 /* FFprobe context */
@@ -160,13 +195,8 @@ typedef struct Writer {
     int  (*init)  (WriterContext *wctx, const char *args, void *opaque);
     void (*uninit)(WriterContext *wctx);
 
-    void (*print_header)(WriterContext *ctx);
-    void (*print_footer)(WriterContext *ctx);
-
-    void (*print_chapter_header)(WriterContext *wctx, const char *);
-    void (*print_chapter_footer)(WriterContext *wctx, const char *);
-    void (*print_section_header)(WriterContext *wctx, const char *);
-    void (*print_section_footer)(WriterContext *wctx, const char *);
+    void (*print_section_header)(WriterContext *wctx);
+    void (*print_section_footer)(WriterContext *wctx);
     void (*print_integer)       (WriterContext *wctx, const char *, long long int);
     void (*print_rational)      (WriterContext *wctx, AVRational *q, char *sep);
     void (*print_string)        (WriterContext *wctx, const char *, const char *);
@@ -174,19 +204,24 @@ typedef struct Writer {
     int flags;                  ///< a combination or WRITER_FLAG_*
 } Writer;
 
+#define MAX_SECTION_LEVEL 10
+
 struct WriterContext {
     const AVClass *class;           ///< class of the writer
     const Writer *writer;           ///< the Writer of which this is an instance
     char *name;                     ///< name of this writer instance
     void *priv;                     ///< private data for use by the filter
-    unsigned int nb_item;           ///< number of the item printed in the given section, starting at 0
-    unsigned int nb_section;        ///< number of the section printed in the given section sequence, starting at 0
+
     unsigned int nb_section_packet; ///< number of the packet section in case we are in "packets_and_frames" section
     unsigned int nb_section_frame;  ///< number of the frame  section in case we are in "packets_and_frames" section
     unsigned int nb_section_packet_frame; ///< nb_section_packet or nb_section_frame according if is_packets_and_frames
-    unsigned int nb_chapter;        ///< number of the chapter, starting at 0
 
-    int multiple_sections;          ///< tells if the current chapter can contain multiple sections
+    int level;                      ///< current level, starting from 0
+
+    ///< number of the item printed in the given section, starting at 0
+    unsigned int nb_item[MAX_SECTION_LEVEL];
+    const struct section *sections[MAX_SECTION_LEVEL];
+
     int is_fmt_chapter;             ///< tells if the current chapter is "format", required by the print_format_entry option
     int is_packets_and_frames;      ///< tells if the current section is "packets_and_frames"
 };
@@ -234,6 +269,7 @@ static int writer_open(WriterContext **wctx, const Writer *writer,
 
     (*wctx)->class = &writer_class;
     (*wctx)->writer = writer;
+    (*wctx)->level = -1;
 
     if (writer->priv_class) {
         void *priv_ctx = (*wctx)->priv;
@@ -256,64 +292,47 @@ fail:
     return ret;
 }
 
-static inline void writer_print_header(WriterContext *wctx)
+static inline void writer_print_section_header(WriterContext *wctx,
+                                               const struct section *section)
 {
-    if (wctx->writer->print_header)
-        wctx->writer->print_header(wctx);
-    wctx->nb_chapter = 0;
-}
+    const struct section *parent_section;
 
-static inline void writer_print_footer(WriterContext *wctx)
-{
-    if (wctx->writer->print_footer)
-        wctx->writer->print_footer(wctx);
-}
+    wctx->level++;
+    av_assert0(wctx->level <= MAX_SECTION_LEVEL);
+    parent_section = wctx->level ? wctx->sections[wctx->level-1] : NULL;
 
-static inline void writer_print_chapter_header(WriterContext *wctx,
-                                               const char *chapter)
-{
-    wctx->nb_section =
-    wctx->nb_section_packet = wctx->nb_section_frame =
-    wctx->nb_section_packet_frame = 0;
-    wctx->is_packets_and_frames = !strcmp(chapter, "packets_and_frames");
-    wctx->multiple_sections = !strcmp(chapter, "packets") || !strcmp(chapter, "frames" ) ||
-                              wctx->is_packets_and_frames ||
-                              !strcmp(chapter, "streams") || !strcmp(chapter, "library_versions");
-    wctx->is_fmt_chapter = !strcmp(chapter, "format");
+    wctx->nb_item[wctx->level] = 0;
+    wctx->sections[wctx->level] = section;
 
-    if (wctx->writer->print_chapter_header)
-        wctx->writer->print_chapter_header(wctx, chapter);
-}
+    if (section == &packets_and_frames_section) {
+        wctx->nb_section_packet = wctx->nb_section_frame =
+            wctx->nb_section_packet_frame = 0;
+    } else if (parent_section == &packets_and_frames_section) {
+        wctx->nb_section_packet_frame = section == &packet_section ?
+            wctx->nb_section_packet : wctx->nb_section_frame;
+    }
 
-static inline void writer_print_chapter_footer(WriterContext *wctx,
-                                               const char *chapter)
-{
-    if (wctx->writer->print_chapter_footer)
-        wctx->writer->print_chapter_footer(wctx, chapter);
-    wctx->nb_chapter++;
-}
+    wctx->is_fmt_chapter = !strcmp(section->name, "format");
 
-static inline void writer_print_section_header(WriterContext *wctx,
-                                               const char *section)
-{
-    if (wctx->is_packets_and_frames)
-        wctx->nb_section_packet_frame = !strcmp(section, "packet") ? wctx->nb_section_packet
-                                                                   : wctx->nb_section_frame;
     if (wctx->writer->print_section_header)
-        wctx->writer->print_section_header(wctx, section);
-    wctx->nb_item = 0;
+        wctx->writer->print_section_header(wctx);
 }
 
-static inline void writer_print_section_footer(WriterContext *wctx,
-                                               const char *section)
+static inline void writer_print_section_footer(WriterContext *wctx)
 {
-    if (wctx->writer->print_section_footer)
-        wctx->writer->print_section_footer(wctx, section);
-    if (wctx->is_packets_and_frames) {
-        if (!strcmp(section, "packet")) wctx->nb_section_packet++;
-        else                            wctx->nb_section_frame++;
+    const struct section *section = wctx->sections[wctx->level];
+    const struct section *parent_section = wctx->level ?
+        wctx->sections[wctx->level-1] : NULL;
+
+    if (parent_section)
+        wctx->nb_item[wctx->level-1]++;
+    if (parent_section == &packets_and_frames_section) {
+        if (!strcmp(section->name, "packet")) wctx->nb_section_packet++;
+        else                                  wctx->nb_section_frame++;
     }
-    wctx->nb_section++;
+    if (wctx->writer->print_section_footer)
+        wctx->writer->print_section_footer(wctx);
+    wctx->level--;
 }
 
 static inline void writer_print_integer(WriterContext *wctx,
@@ -321,7 +340,7 @@ static inline void writer_print_integer(WriterContext *wctx,
 {
     if (!wctx->is_fmt_chapter || !fmt_entries_to_show || av_dict_get(fmt_entries_to_show, key, NULL, 0)) {
         wctx->writer->print_integer(wctx, key, val);
-        wctx->nb_item++;
+        wctx->nb_item[wctx->level]++;
     }
 }
 
@@ -332,7 +351,7 @@ static inline void writer_print_rational(WriterContext *wctx,
     av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC);
     av_bprintf(&buf, "%d%c%d", q.num, sep, q.den);
     wctx->writer->print_string(wctx, key, buf.str);
-    wctx->nb_item++;
+    wctx->nb_item[wctx->level]++;
 }
 
 static inline void writer_print_string(WriterContext *wctx,
@@ -342,7 +361,7 @@ static inline void writer_print_string(WriterContext *wctx,
         return;
     if (!wctx->is_fmt_chapter || !fmt_entries_to_show || av_dict_get(fmt_entries_to_show, key, NULL, 0)) {
         wctx->writer->print_string(wctx, key, val);
-        wctx->nb_item++;
+        wctx->nb_item[wctx->level]++;
     }
 }
 
@@ -477,22 +496,26 @@ static inline char *upcase_string(char *dst, size_t dst_size, const char *src)
     return dst;
 }
 
-static void default_print_section_header(WriterContext *wctx, const char *section)
+static void default_print_section_header(WriterContext *wctx)
 {
     DefaultContext *def = wctx->priv;
     char buf[32];
+    const struct section *section = wctx->sections[wctx->level];
 
-    if (!def->noprint_wrappers)
-        printf("[%s]\n", upcase_string(buf, sizeof(buf), section));
+    if (!def->noprint_wrappers &&
+        !(section->flags & (SECTION_FLAG_IS_WRAPPER|SECTION_FLAG_IS_ARRAY)))
+        printf("[%s]\n", upcase_string(buf, sizeof(buf), section->name));
 }
 
-static void default_print_section_footer(WriterContext *wctx, const char *section)
+static void default_print_section_footer(WriterContext *wctx)
 {
     DefaultContext *def = wctx->priv;
+    const struct section *section = wctx->sections[wctx->level];
     char buf[32];
 
-    if (!def->noprint_wrappers)
-        printf("[/%s]\n", upcase_string(buf, sizeof(buf), section));
+    if (!def->noprint_wrappers &&
+        !(section->flags & (SECTION_FLAG_IS_WRAPPER|SECTION_FLAG_IS_ARRAY)))
+        printf("[/%s]\n", upcase_string(buf, sizeof(buf), section->name));
 }
 
 static void default_print_str(WriterContext *wctx, const char *key, const char *value)
@@ -639,17 +662,22 @@ static av_cold int compact_init(WriterContext *wctx, const char *args, void *opa
     return 0;
 }
 
-static void compact_print_section_header(WriterContext *wctx, const char *section)
+static void compact_print_section_header(WriterContext *wctx)
 {
     CompactContext *compact = wctx->priv;
+    const struct section *section = wctx->sections[wctx->level];
 
-    if (compact->print_section)
-        printf("%s%c", section, compact->item_sep);
+    if (compact->print_section &&
+        !(section->flags & (SECTION_FLAG_IS_WRAPPER|SECTION_FLAG_IS_ARRAY)))
+        printf("%s%c", section->name, compact->item_sep);
 }
 
-static void compact_print_section_footer(WriterContext *wctx, const char *section)
+static void compact_print_section_footer(WriterContext *wctx)
 {
-    printf("\n");
+    const struct section *section = wctx->sections[wctx->level];
+
+    if (!(section->flags & (SECTION_FLAG_IS_WRAPPER|SECTION_FLAG_IS_ARRAY)))
+        printf("\n");
 }
 
 static void compact_print_str(WriterContext *wctx, const char *key, const char *value)
@@ -657,7 +685,7 @@ static void compact_print_str(WriterContext *wctx, const char *key, const char *
     CompactContext *compact = wctx->priv;
     AVBPrint buf;
 
-    if (wctx->nb_item) printf("%c", compact->item_sep);
+    if (wctx->nb_item[wctx->level]) printf("%c", compact->item_sep);
     if (!compact->nokey)
         printf("%s=", key);
     av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED);
@@ -669,7 +697,7 @@ static void compact_print_int(WriterContext *wctx, const char *key, long long in
 {
     CompactContext *compact = wctx->priv;
 
-    if (wctx->nb_item) printf("%c", compact->item_sep);
+    if (wctx->nb_item[wctx->level]) printf("%c", compact->item_sep);
     if (!compact->nokey)
         printf("%s=", key);
     printf("%lld", value);
@@ -683,7 +711,7 @@ static void compact_show_tags(WriterContext *wctx, AVDictionary *dict)
 
     av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED);
     while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
-        if (wctx->nb_item) printf("%c", compact->item_sep);
+        if (wctx->nb_item[wctx->level]) printf("%c", compact->item_sep);
         if (!compact->nokey) {
             av_bprint_clear(&buf);
             printf("tag:%s=", compact->escape_str(&buf, tag->key, compact->item_sep, wctx));
@@ -731,7 +759,6 @@ static const Writer csv_writer = {
 
 typedef struct FlatContext {
     const AVClass *class;
-    const char *section, *chapter;
     const char *sep_str;
     char sep;
     int hierarchical;
@@ -796,28 +823,19 @@ static const char *flat_escape_value_str(AVBPrint *dst, const char *src)
     return dst->str;
 }
 
-static void flat_print_chapter_header(WriterContext *wctx, const char *chapter)
-{
-    FlatContext *flat = wctx->priv;
-    flat->chapter = chapter;
-}
-
-static void flat_print_section_header(WriterContext *wctx, const char *section)
-{
-    FlatContext *flat = wctx->priv;
-    flat->section = section;
-}
-
 static void flat_print_section(WriterContext *wctx)
 {
     FlatContext *flat = wctx->priv;
-    int n = wctx->is_packets_and_frames ? wctx->nb_section_packet_frame
-                                        : wctx->nb_section;
+    const struct section *section        = wctx->sections[wctx->level];
+    const struct section *parent_section = wctx->sections[wctx->level-1];
+
+    int n = parent_section == &packets_and_frames_section ?
+        wctx->nb_section_packet_frame : wctx->nb_item[wctx->level-1];
 
-    if (flat->hierarchical && wctx->multiple_sections)
-        printf("%s%c", flat->chapter, flat->sep);
-    printf("%s%c", flat->section, flat->sep);
-    if (wctx->multiple_sections)
+    if (flat->hierarchical && parent_section->flags & SECTION_FLAG_IS_ARRAY)
+        printf("%s%c", parent_section->name, flat->sep);
+    printf("%s%c", section->name, flat->sep);
+    if (parent_section->flags & SECTION_FLAG_IS_ARRAY)
         printf("%d%c", n, flat->sep);
 }
 
@@ -861,8 +879,6 @@ static const Writer flat_writer = {
     .name                  = "flat",
     .priv_size             = sizeof(FlatContext),
     .init                  = flat_init,
-    .print_chapter_header  = flat_print_chapter_header,
-    .print_section_header  = flat_print_section_header,
     .print_integer         = flat_print_int,
     .print_string          = flat_print_str,
     .show_tags             = flat_show_tags,
@@ -906,11 +922,6 @@ static av_cold void ini_uninit(WriterContext *wctx)
     av_bprint_finalize(&ini->section_name, NULL);
 }
 
-static void ini_print_header(WriterContext *wctx)
-{
-    printf("# ffprobe output\n\n");
-}
-
 static char *ini_escape_str(AVBPrint *dst, const char *src)
 {
     int i = 0;
@@ -938,33 +949,34 @@ static char *ini_escape_str(AVBPrint *dst, const char *src)
     return dst->str;
 }
 
-static void ini_print_chapter_header(WriterContext *wctx, const char *chapter)
+static void ini_print_section_header(WriterContext *wctx)
 {
     INIContext *ini = wctx->priv;
+    const struct section *section = wctx->sections[wctx->level];
+    const struct section *parent_section = wctx->level ?
+        wctx->sections[wctx->level-1] : NULL;
 
-    av_bprint_clear(&ini->chapter_name);
-    av_bprintf(&ini->chapter_name, "%s", chapter);
+    int n = parent_section == &packets_and_frames_section ?
+         wctx->nb_section_packet_frame : wctx->nb_item[wctx->level-1];
 
-    if (wctx->nb_chapter)
-        printf("\n");
-}
+    if (wctx->level == 0) {
+        printf("# ffprobe output\n\n");
+        return;
+    }
 
-static void ini_print_section_header(WriterContext *wctx, const char *section)
-{
-    INIContext *ini = wctx->priv;
-    int n = wctx->is_packets_and_frames ? wctx->nb_section_packet_frame
-                                        : wctx->nb_section;
-    if (wctx->nb_section)
+    if (wctx->nb_item[wctx->level-1])
         printf("\n");
     av_bprint_clear(&ini->section_name);
 
-    if (ini->hierarchical && wctx->multiple_sections)
-        av_bprintf(&ini->section_name, "%s.", ini->chapter_name.str);
-    av_bprintf(&ini->section_name, "%s", section);
+    if (ini->hierarchical &&
+        (parent_section->flags & SECTION_FLAG_IS_ARRAY))
+        av_bprintf(&ini->section_name, "%s.", parent_section->name);
+    av_bprintf(&ini->section_name, "%s", section->name);
 
-    if (wctx->multiple_sections)
+    if (parent_section->flags & SECTION_FLAG_IS_ARRAY)
         av_bprintf(&ini->section_name, ".%d", n);
-    printf("[%s]\n", ini->section_name.str);
+    if (!(section->flags & SECTION_FLAG_IS_ARRAY))
+        printf("[%s]\n", ini->section_name.str);
 }
 
 static void ini_print_str(WriterContext *wctx, const char *key, const char *value)
@@ -1003,8 +1015,6 @@ static const Writer ini_writer = {
     .priv_size             = sizeof(INIContext),
     .init                  = ini_init,
     .uninit                = ini_uninit,
-    .print_header          = ini_print_header,
-    .print_chapter_header  = ini_print_chapter_header,
     .print_section_header  = ini_print_section_header,
     .print_integer         = ini_print_int,
     .print_string          = ini_print_str,
@@ -1063,81 +1073,68 @@ static const char *json_escape_str(AVBPrint *dst, const char *src, void *log_ctx
     return dst->str;
 }
 
-static void json_print_header(WriterContext *wctx)
-{
-    JSONContext *json = wctx->priv;
-    printf("{");
-    json->indent_level++;
-}
-
-static void json_print_footer(WriterContext *wctx)
-{
-    JSONContext *json = wctx->priv;
-    json->indent_level--;
-    printf("\n}\n");
-}
-
 #define JSON_INDENT() printf("%*c", json->indent_level * 4, ' ')
 
-static void json_print_chapter_header(WriterContext *wctx, const char *chapter)
+static void json_print_section_header(WriterContext *wctx)
 {
     JSONContext *json = wctx->priv;
     AVBPrint buf;
+    const struct section *section = wctx->sections[wctx->level];
+    const struct section *parent_section = wctx->level ?
+        wctx->sections[wctx->level-1] : NULL;
 
-    if (wctx->nb_chapter)
-        printf(",");
-    printf("\n");
-    if (wctx->multiple_sections) {
-        JSON_INDENT();
+    if (wctx->level && wctx->nb_item[wctx->level-1])
+        printf(",\n");
+
+    if (section->flags & SECTION_FLAG_IS_WRAPPER) {
+        printf("{\n");
+        json->indent_level++;
+    } else {
         av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED);
-        printf("\"%s\": [\n", json_escape_str(&buf, chapter, wctx));
-        av_bprint_finalize(&buf, NULL);
+        json_escape_str(&buf, section->name, wctx);
+        JSON_INDENT();
+
+        if (section->flags & SECTION_FLAG_IS_ARRAY) {
+            printf("\"%s\": [\n", buf.str);
+        } else if (!(parent_section->flags & SECTION_FLAG_IS_ARRAY)) {
+            printf("\"%s\": {%s", buf.str, json->item_start_end);
+        } else {
+            printf("{%s", json->item_start_end);
+
+            /* this is required so the parser can distinguish between packets and frames */
+            if (parent_section == &packets_and_frames_section) {
+                if (!json->compact)
+                    JSON_INDENT();
+                printf("\"type\": \"%s\"%s", section->name, json->item_sep);
+            }
+        }
         json->indent_level++;
+        av_bprint_finalize(&buf, NULL);
     }
 }
 
-static void json_print_chapter_footer(WriterContext *wctx, const char *chapter)
+static void json_print_section_footer(WriterContext *wctx)
 {
     JSONContext *json = wctx->priv;
+    const struct section *section = wctx->sections[wctx->level];
 
-    if (wctx->multiple_sections) {
+    if (wctx->level == 0) {
+        json->indent_level--;
+        printf("\n}\n");
+    } else if (section->flags & SECTION_FLAG_IS_ARRAY) {
         printf("\n");
         json->indent_level--;
         JSON_INDENT();
         printf("]");
-    }
-}
-
-static void json_print_section_header(WriterContext *wctx, const char *section)
-{
-    JSONContext *json = wctx->priv;
-
-    if (wctx->nb_section)
-        printf(",\n");
-    JSON_INDENT();
-    if (!wctx->multiple_sections)
-        printf("\"%s\": ", section);
-    printf("{%s", json->item_start_end);
-    json->indent_level++;
-    /* this is required so the parser can distinguish between packets and frames */
-    if (wctx->is_packets_and_frames) {
+    } else {
+        printf("%s", json->item_start_end);
+        json->indent_level--;
         if (!json->compact)
             JSON_INDENT();
-        printf("\"type\": \"%s\"%s", section, json->item_sep);
+        printf("}");
     }
 }
 
-static void json_print_section_footer(WriterContext *wctx, const char *section)
-{
-    JSONContext *json = wctx->priv;
-
-    printf("%s", json->item_start_end);
-    json->indent_level--;
-    if (!json->compact)
-        JSON_INDENT();
-    printf("}");
-}
-
 static inline void json_print_item_str(WriterContext *wctx,
                                        const char *key, const char *value)
 {
@@ -1154,7 +1151,8 @@ static void json_print_str(WriterContext *wctx, const char *key, const char *val
 {
     JSONContext *json = wctx->priv;
 
-    if (wctx->nb_item) printf("%s", json->item_sep);
+    if (wctx->nb_item[wctx->level])
+        printf("%s", json->item_sep);
     if (!json->compact)
         JSON_INDENT();
     json_print_item_str(wctx, key, value);
@@ -1165,7 +1163,8 @@ static void json_print_int(WriterContext *wctx, const char *key, long long int v
     JSONContext *json = wctx->priv;
     AVBPrint buf;
 
-    if (wctx->nb_item) printf("%s", json->item_sep);
+    if (wctx->nb_item[wctx->level])
+        printf("%s", json->item_sep);
     if (!json->compact)
         JSON_INDENT();
 
@@ -1185,7 +1184,6 @@ static void json_show_tags(WriterContext *wctx, AVDictionary *dict)
     if (!json->compact)
         JSON_INDENT();
     printf("\"tags\": {%s", json->item_start_end);
-    json->indent_level++;
     while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
         if (is_first) is_first = 0;
         else          printf("%s", json->item_sep);
@@ -1193,7 +1191,6 @@ static void json_show_tags(WriterContext *wctx, AVDictionary *dict)
             JSON_INDENT();
         json_print_item_str(wctx, tag->key, tag->value);
     }
-    json->indent_level--;
     printf("%s", json->item_start_end);
     if (!json->compact)
         JSON_INDENT();
@@ -1204,10 +1201,6 @@ static const Writer json_writer = {
     .name                 = "json",
     .priv_size            = sizeof(JSONContext),
     .init                 = json_init,
-    .print_header         = json_print_header,
-    .print_footer         = json_print_footer,
-    .print_chapter_header = json_print_chapter_header,
-    .print_chapter_footer = json_print_chapter_footer,
     .print_section_header = json_print_section_header,
     .print_section_footer = json_print_section_footer,
     .print_integer        = json_print_int,
@@ -1286,69 +1279,55 @@ static const char *xml_escape_str(AVBPrint *dst, const char *src, void *log_ctx)
     return dst->str;
 }
 
-static void xml_print_header(WriterContext *wctx)
-{
-    XMLContext *xml = wctx->priv;
-    const char *qual = " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' "
-        "xmlns:ffprobe='http://www.ffmpeg.org/schema/ffprobe' "
-        "xsi:schemaLocation='http://www.ffmpeg.org/schema/ffprobe ffprobe.xsd'";
-
-    printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-    printf("<%sffprobe%s>\n",
-           xml->fully_qualified ? "ffprobe:" : "",
-           xml->fully_qualified ? qual : "");
-
-    xml->indent_level++;
-}
-
-static void xml_print_footer(WriterContext *wctx)
-{
-    XMLContext *xml = wctx->priv;
-
-    xml->indent_level--;
-    printf("</%sffprobe>\n", xml->fully_qualified ? "ffprobe:" : "");
-}
-
 #define XML_INDENT() printf("%*c", xml->indent_level * 4, ' ')
 
-static void xml_print_chapter_header(WriterContext *wctx, const char *chapter)
+static void xml_print_section_header(WriterContext *wctx)
 {
     XMLContext *xml = wctx->priv;
+    const struct section *section = wctx->sections[wctx->level];
+    const struct section *parent_section = wctx->level ?
+        wctx->sections[wctx->level-1] : NULL;
+
+    if (wctx->level == 0) {
+        const char *qual = " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' "
+            "xmlns:ffprobe='http://www.ffmpeg.org/schema/ffprobe' "
+            "xsi:schemaLocation='http://www.ffmpeg.org/schema/ffprobe ffprobe.xsd'";
+
+        printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+        printf("<%sffprobe%s>\n",
+               xml->fully_qualified ? "ffprobe:" : "",
+               xml->fully_qualified ? qual : "");
+    } else {
+        if (!(parent_section->flags & SECTION_FLAG_IS_ARRAY)) {
+            if (wctx->level && wctx->nb_item[wctx->level-1])
+                printf("\n");
+        }
 
-    if (wctx->nb_chapter)
-        printf("\n");
-    if (wctx->multiple_sections) {
-        XML_INDENT(); printf("<%s>\n", chapter);
         xml->indent_level++;
-    }
-}
-
-static void xml_print_chapter_footer(WriterContext *wctx, const char *chapter)
-{
-    XMLContext *xml = wctx->priv;
 
-    if (wctx->multiple_sections) {
-        xml->indent_level--;
-        XML_INDENT(); printf("</%s>\n", chapter);
+        if (section->flags & SECTION_FLAG_IS_ARRAY) {
+            XML_INDENT(); printf("<%s>\n", section->name);
+        } else {
+            XML_INDENT(); printf("<%s ", section->name);
+            xml->within_tag = 1;
+        }
     }
 }
 
-static void xml_print_section_header(WriterContext *wctx, const char *section)
-{
-    XMLContext *xml = wctx->priv;
-
-    XML_INDENT(); printf("<%s ", section);
-    xml->within_tag = 1;
-}
-
-static void xml_print_section_footer(WriterContext *wctx, const char *section)
+static void xml_print_section_footer(WriterContext *wctx)
 {
     XMLContext *xml = wctx->priv;
+    const struct section *section = wctx->sections[wctx->level];
 
-    if (xml->within_tag)
+    if (wctx->level == 0) {
+        printf("</%sffprobe>\n", xml->fully_qualified ? "ffprobe:" : "");
+    } else if (xml->within_tag) {
+        xml->within_tag = 0;
         printf("/>\n");
-    else {
-        XML_INDENT(); printf("</%s>\n", section);
+        xml->indent_level--;
+    } else {
+        XML_INDENT(); printf("</%s>\n", section->name);
+        xml->indent_level--;
     }
 }
 
@@ -1356,7 +1335,7 @@ static void xml_print_str(WriterContext *wctx, const char *key, const char *valu
 {
     AVBPrint buf;
 
-    if (wctx->nb_item)
+    if (wctx->nb_item[wctx->level])
         printf(" ");
     av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED);
     printf("%s=\"%s\"", key, xml_escape_str(&buf, value, wctx));
@@ -1365,7 +1344,7 @@ static void xml_print_str(WriterContext *wctx, const char *key, const char *valu
 
 static void xml_print_int(WriterContext *wctx, const char *key, long long int value)
 {
-    if (wctx->nb_item)
+    if (wctx->nb_item[wctx->level])
         printf(" ");
     printf("%s=\"%lld\"", key, value);
 }
@@ -1401,10 +1380,6 @@ static Writer xml_writer = {
     .name                 = "xml",
     .priv_size            = sizeof(XMLContext),
     .init                 = xml_init,
-    .print_header         = xml_print_header,
-    .print_footer         = xml_print_footer,
-    .print_chapter_header = xml_print_chapter_header,
-    .print_chapter_footer = xml_print_chapter_footer,
     .print_section_header = xml_print_section_header,
     .print_section_footer = xml_print_section_footer,
     .print_integer        = xml_print_int,
@@ -1465,7 +1440,8 @@ static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pk
 
     av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
 
-    print_section_header("packet");
+    writer_print_section_header(w, &packet_section);
+
     s = av_get_media_type_string(st->codec->codec_type);
     if (s) print_str    ("codec_type", s);
     else   print_str_opt("codec_type", "unknown");
@@ -1484,7 +1460,7 @@ static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pk
     print_fmt("flags", "%c",      pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
     if (do_show_data)
         writer_print_data(w, "data", pkt->data, pkt->size);
-    print_section_footer("packet");
+    writer_print_section_footer(w);
 
     av_bprint_finalize(&pbuf, NULL);
     fflush(stdout);
@@ -1498,7 +1474,7 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
 
     av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
 
-    print_section_header("frame");
+    writer_print_section_header(w, &frame_section);
 
     s = av_get_media_type_string(stream->codec->codec_type);
     if (s) print_str    ("media_type", s);
@@ -1554,7 +1530,7 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
     }
     show_tags(av_frame_get_metadata(frame));
 
-    print_section_footer("frame");
+    writer_print_section_footer(w);
 
     av_bprint_finalize(&pbuf, NULL);
     fflush(stdout);
@@ -1636,7 +1612,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
 
     av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
 
-    print_section_header("stream");
+    writer_print_section_header(w, &stream_section);
 
     print_int("index", stream->index);
 
@@ -1741,7 +1717,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
                                           dec_ctx->extradata_size);
     show_tags(stream->metadata);
 
-    print_section_footer("stream");
+    writer_print_section_footer(w);
     av_bprint_finalize(&pbuf, NULL);
     fflush(stdout);
 }
@@ -1749,8 +1725,10 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
 static void show_streams(WriterContext *w, AVFormatContext *fmt_ctx)
 {
     int i;
+    writer_print_section_header(w, &streams_section);
     for (i = 0; i < fmt_ctx->nb_streams; i++)
         show_stream(w, fmt_ctx, i);
+    writer_print_section_footer(w);
 }
 
 static void show_format(WriterContext *w, AVFormatContext *fmt_ctx)
@@ -1758,7 +1736,7 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx)
     char val_str[128];
     int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1;
 
-    print_section_header("format");
+    writer_print_section_header(w, &format_section);
     print_str("filename",         fmt_ctx->filename);
     print_int("nb_streams",       fmt_ctx->nb_streams);
     print_str("format_name",      fmt_ctx->iformat->name);
@@ -1770,7 +1748,7 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx)
     if (fmt_ctx->bit_rate > 0) print_val    ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str);
     else                       print_str_opt("bit_rate", "N/A");
     show_tags(fmt_ctx->metadata);
-    print_section_footer("format");
+    writer_print_section_footer(w);
     fflush(stdout);
 }
 
@@ -1782,12 +1760,10 @@ static void show_error(WriterContext *w, int err)
     if (av_strerror(err, errbuf, sizeof(errbuf)) < 0)
         errbuf_ptr = strerror(AVUNERROR(err));
 
-    writer_print_chapter_header(w, "error");
-    print_section_header("error");
+    writer_print_section_header(w, &error_section);
     print_int("code", err);
     print_str("string", errbuf_ptr);
-    print_section_footer("error");
-    writer_print_chapter_footer(w, "error");
+    writer_print_section_footer(w);
 }
 
 static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
@@ -1851,18 +1827,11 @@ static void close_input_file(AVFormatContext **ctx_ptr)
     avformat_close_input(ctx_ptr);
 }
 
-#define PRINT_CHAPTER(name) do {                                        \
-    if (do_show_ ## name) {                                             \
-        writer_print_chapter_header(wctx, #name);                       \
-        show_ ## name (wctx, fmt_ctx);                                  \
-        writer_print_chapter_footer(wctx, #name);                       \
-    }                                                                   \
-} while (0)
-
 static int probe_file(WriterContext *wctx, const char *filename)
 {
     AVFormatContext *fmt_ctx;
     int ret;
+    struct section *section;
 
     do_read_frames = do_show_frames || do_count_frames;
     do_read_packets = do_show_packets || do_count_packets;
@@ -1872,22 +1841,24 @@ static int probe_file(WriterContext *wctx, const char *filename)
         nb_streams_frames  = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames));
         nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets));
         if (do_read_frames || do_read_packets) {
-            const char *chapter;
             if (do_show_frames && do_show_packets &&
                 wctx->writer->flags & WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER)
-                chapter = "packets_and_frames";
+                section = &packets_and_frames_section;
             else if (do_show_packets && !do_show_frames)
-                chapter = "packets";
+                section = &packets_section;
             else // (!do_show_packets && do_show_frames)
-                chapter = "frames";
+                section = &frames_section;
             if (do_show_frames || do_show_packets)
-                writer_print_chapter_header(wctx, chapter);
+                writer_print_section_header(wctx, section);
             read_packets(wctx, fmt_ctx);
             if (do_show_frames || do_show_packets)
-                writer_print_chapter_footer(wctx, chapter);
+                writer_print_section_footer(wctx);
         }
-        PRINT_CHAPTER(streams);
-        PRINT_CHAPTER(format);
+        if (do_show_streams)
+            show_streams(wctx, fmt_ctx);
+        if (do_show_format)
+            show_format(wctx, fmt_ctx);
+
         close_input_file(&fmt_ctx);
         av_freep(&nb_streams_frames);
         av_freep(&nb_streams_packets);
@@ -1907,8 +1878,7 @@ static void ffprobe_show_program_version(WriterContext *w)
     AVBPrint pbuf;
     av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
 
-    writer_print_chapter_header(w, "program_version");
-    print_section_header("program_version");
+    writer_print_section_header(w, &program_version_section);
     print_str("version", FFMPEG_VERSION);
     print_fmt("copyright", "Copyright (c) %d-%d the FFmpeg developers",
               program_birth_year, this_year);
@@ -1916,8 +1886,7 @@ static void ffprobe_show_program_version(WriterContext *w)
     print_str("build_time", __TIME__);
     print_str("compiler_ident", CC_IDENT);
     print_str("configuration", FFMPEG_CONFIGURATION);
-    print_section_footer("program_version");
-    writer_print_chapter_footer(w, "program_version");
+    writer_print_section_footer(w);
 
     av_bprint_finalize(&pbuf, NULL);
 }
@@ -1926,19 +1895,19 @@ static void ffprobe_show_program_version(WriterContext *w)
     do {                                                                \
         if (CONFIG_##LIBNAME) {                                         \
             unsigned int version = libname##_version();                 \
-            print_section_header("library_version");                    \
+            writer_print_section_header(w, &library_version_section);   \
             print_str("name",    "lib" #libname);                       \
             print_int("major",   LIB##LIBNAME##_VERSION_MAJOR);         \
             print_int("minor",   LIB##LIBNAME##_VERSION_MINOR);         \
             print_int("micro",   LIB##LIBNAME##_VERSION_MICRO);         \
             print_int("version", version);                              \
-            print_section_footer("library_version");                    \
+            writer_print_section_footer(w);                             \
         }                                                               \
     } while (0)
 
 static void ffprobe_show_library_versions(WriterContext *w)
 {
-    writer_print_chapter_header(w, "library_versions");
+    writer_print_section_header(w, &library_versions_section);
     SHOW_LIB_VERSION(avutil,     AVUTIL);
     SHOW_LIB_VERSION(avcodec,    AVCODEC);
     SHOW_LIB_VERSION(avformat,   AVFORMAT);
@@ -1947,7 +1916,7 @@ static void ffprobe_show_library_versions(WriterContext *w)
     SHOW_LIB_VERSION(swscale,    SWSCALE);
     SHOW_LIB_VERSION(swresample, SWRESAMPLE);
     SHOW_LIB_VERSION(postproc,   POSTPROC);
-    writer_print_chapter_footer(w, "library_versions");
+    writer_print_section_footer(w);
 }
 
 static int opt_format(void *optctx, const char *opt, const char *arg)
@@ -2082,7 +2051,7 @@ int main(int argc, char **argv)
     }
 
     if ((ret = writer_open(&wctx, w, w_args, NULL)) >= 0) {
-        writer_print_header(wctx);
+        writer_print_section_header(wctx, &root_section);
 
         if (do_show_program_version)
             ffprobe_show_program_version(wctx);
@@ -2102,7 +2071,7 @@ int main(int argc, char **argv)
                 show_error(wctx, ret);
         }
 
-        writer_print_footer(wctx);
+        writer_print_section_footer(wctx);
         writer_close(&wctx);
     }
 
-- 
1.7.5.4



More information about the ffmpeg-devel mailing list