fftools/ffprobe: export Tile Grid Stream Group parameters

Signed-off-by: James Almer <jamrial@gmail.com>

6 files changed, 165 insertions, 11 deletions

diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index 5010c5a45f..bd52000725 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -15,6 +15,7 @@
       <xsd:element name="frames"   type="ffprobe:framesType"  minOccurs="0" maxOccurs="1" />
       <xsd:element name="packets_and_frames" type="ffprobe:packetsAndFramesType" minOccurs="0" maxOccurs="1" />
       <xsd:element name="programs" type="ffprobe:programsType" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="stream_groups" type="ffprobe:StreamGroupsType" minOccurs="0" maxOccurs="1" />
       <xsd:element name="streams"  type="ffprobe:streamsType" minOccurs="0" maxOccurs="1" />
       <xsd:element name="chapters" type="ffprobe:chaptersType" minOccurs="0" maxOccurs="1" />
       <xsd:element name="format"   type="ffprobe:formatType"  minOccurs="0" maxOccurs="1" />
@@ -229,6 +230,12 @@
     </xsd:sequence>
   </xsd:complexType>
 
+  <xsd:complexType name="StreamGroupsType">
+    <xsd:sequence>
+      <xsd:element name="stream_group" type="ffprobe:streamGroupType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
   <xsd:complexType name="streamDispositionType">
     <xsd:attribute name="default"          type="xsd:int" use="required" />
     <xsd:attribute name="dub"              type="xsd:int" use="required" />
@@ -325,6 +332,49 @@
     <xsd:attribute name="pcr_pid"              type="xsd:int"    use="required"/>
   </xsd:complexType>
 
+  <xsd:complexType name="streamGroupType">
+    <xsd:sequence>
+      <xsd:element name="disposition"      type="ffprobe:streamDispositionType" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="tags"             type="ffprobe:tagsType" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="streams"          type="ffprobe:streamsType" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="components"       type="ffprobe:streamGroupComponentList" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
+
+    <xsd:attribute name="index"            type="xsd:int"    use="required"/>
+    <xsd:attribute name="nb_streams"       type="xsd:int"    use="required"/>
+    <xsd:attribute name="type"             type="xsd:string" use="required"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="streamGroupComponentList">
+    <xsd:sequence>
+      <xsd:element name="component" type="ffprobe:streamGroupComponentType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="streamGroupComponentType">
+    <xsd:sequence>
+      <xsd:element name="subcomponents" type="ffprobe:streamGroupSubComponentList" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="component_entry" type="ffprobe:streamGroupEntryType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="streamGroupSubComponentList">
+    <xsd:sequence>
+      <xsd:element name="subcomponent" type="ffprobe:streamGroupSubComponentType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="streamGroupSubComponentType">
+    <xsd:sequence>
+      <xsd:element name="subcomponent_entry" type="ffprobe:streamGroupEntryType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="streamGroupEntryType">
+    <xsd:attribute name="key"   type="xsd:string"/>
+    <xsd:attribute name="value" type="xsd:string"/>
+  </xsd:complexType>
+
   <xsd:complexType name="formatType">
     <xsd:sequence>
       <xsd:element name="tags" type="ffprobe:tagsType" minOccurs="0" maxOccurs="1"/>
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index e003ac6cfd..bf635ffbd6 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -114,6 +114,7 @@ static int do_show_frames  = 0;
 static int do_show_packets = 0;
 static int do_show_programs = 0;
 static int do_show_stream_groups = 0;
+static int do_show_stream_group_components = 0;
 static int do_show_streams = 0;
 static int do_show_stream_disposition = 0;
 static int do_show_stream_group_disposition = 0;
@@ -210,6 +211,10 @@ typedef enum {
     SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION,
     SECTION_ID_STREAM_GROUP_STREAM_TAGS,
     SECTION_ID_STREAM_GROUP,
+    SECTION_ID_STREAM_GROUP_COMPONENTS,
+    SECTION_ID_STREAM_GROUP_COMPONENT,
+    SECTION_ID_STREAM_GROUP_SUBCOMPONENTS,
+    SECTION_ID_STREAM_GROUP_SUBCOMPONENT,
     SECTION_ID_STREAM_GROUP_STREAMS,
     SECTION_ID_STREAM_GROUP_STREAM,
     SECTION_ID_STREAM_GROUP_DISPOSITION,
@@ -310,7 +315,11 @@ static struct section sections[] = {
     [SECTION_ID_PROGRAMS] =                   { SECTION_ID_PROGRAMS, "programs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PROGRAM, -1 } },
     [SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION] = { SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_group_stream_disposition" },
     [SECTION_ID_STREAM_GROUP_STREAM_TAGS] =        { SECTION_ID_STREAM_GROUP_STREAM_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "stream_group_stream_tags" },
-    [SECTION_ID_STREAM_GROUP] =                    { SECTION_ID_STREAM_GROUP, "stream_group", SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_TAGS, SECTION_ID_STREAM_GROUP_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAMS, -1 }, .get_type = get_stream_group_type },
+    [SECTION_ID_STREAM_GROUP] =                    { SECTION_ID_STREAM_GROUP, "stream_group", 0, { SECTION_ID_STREAM_GROUP_TAGS, SECTION_ID_STREAM_GROUP_DISPOSITION, SECTION_ID_STREAM_GROUP_COMPONENTS, SECTION_ID_STREAM_GROUP_STREAMS, -1 } },
+    [SECTION_ID_STREAM_GROUP_COMPONENTS] =         { SECTION_ID_STREAM_GROUP_COMPONENTS, "components", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_COMPONENT, -1 }, .element_name = "component", .unique_name = "stream_group_components" },
+    [SECTION_ID_STREAM_GROUP_COMPONENT] =          { SECTION_ID_STREAM_GROUP_COMPONENT, "component", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_SUBCOMPONENTS, -1 }, .unique_name = "stream_group_component", .element_name = "component_entry", .get_type = get_stream_group_type },
+    [SECTION_ID_STREAM_GROUP_SUBCOMPONENTS] =      { SECTION_ID_STREAM_GROUP_SUBCOMPONENTS, "subcomponents", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_SUBCOMPONENT, -1 }, .element_name = "component" },
+    [SECTION_ID_STREAM_GROUP_SUBCOMPONENT] =       { SECTION_ID_STREAM_GROUP_SUBCOMPONENT, "subcomponent", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "subcomponent_entry", .get_type = get_raw_string_type },
     [SECTION_ID_STREAM_GROUP_STREAMS] =            { SECTION_ID_STREAM_GROUP_STREAMS, "streams", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_STREAM, -1 }, .unique_name = "stream_group_streams" },
     [SECTION_ID_STREAM_GROUP_STREAM] =             { SECTION_ID_STREAM_GROUP_STREAM, "stream", 0, { SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAM_TAGS, -1 }, .unique_name = "stream_group_stream" },
     [SECTION_ID_STREAM_GROUP_DISPOSITION] =        { SECTION_ID_STREAM_GROUP_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_group_disposition" },
@@ -3491,13 +3500,35 @@ static int show_programs(WriterContext *w, InputFile *ifile)
     return ret;
 }
 
+static void print_tile_grid_params(WriterContext *w, const AVStreamGroup *stg,
+                                   const AVStreamGroupTileGrid *tile_grid)
+{
+    writer_print_section_header(w, stg, SECTION_ID_STREAM_GROUP_COMPONENT);
+    print_int("nb_tiles",          tile_grid->nb_tiles);
+    print_int("coded_width",       tile_grid->coded_width);
+    print_int("coded_height",      tile_grid->coded_height);
+    print_int("horizontal_offset", tile_grid->horizontal_offset);
+    print_int("vertical_offset",   tile_grid->vertical_offset);
+    print_int("width",             tile_grid->width);
+    print_int("height",            tile_grid->height);
+    writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_SUBCOMPONENTS);
+    for (int i = 0; i < tile_grid->nb_tiles; i++) {
+        writer_print_section_header(w, "tile_offset", SECTION_ID_STREAM_GROUP_SUBCOMPONENT);
+        print_int("stream_index",           tile_grid->offsets[i].idx);
+        print_int("tile_horizontal_offset", tile_grid->offsets[i].horizontal);
+        print_int("tile_vertical_offset",   tile_grid->offsets[i].vertical);
+        writer_print_section_footer(w);
+    }
+    writer_print_section_footer(w);
+    writer_print_section_footer(w);
+}
+
 static void print_stream_group_params(WriterContext *w, AVStreamGroup *stg)
 {
-    const char *unknown = "unknown";
-    if (stg->type != AV_STREAM_GROUP_PARAMS_NONE)
-        print_str("type", av_x_if_null(avformat_stream_group_name(stg->type), unknown));
-    else
-        print_str_opt("type", unknown);
+    writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_COMPONENTS);
+    if (stg->type == AV_STREAM_GROUP_PARAMS_TILE_GRID)
+        print_tile_grid_params(w, stg, stg->params.tile_grid);
+    writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_COMPONENTS
 }
 
 static int show_stream_group(WriterContext *w, InputFile *ifile, AVStreamGroup *stg)
@@ -3507,12 +3538,17 @@ static int show_stream_group(WriterContext *w, InputFile *ifile, AVStreamGroup *
     int i, ret = 0;
 
     av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
-    writer_print_section_header(w, stg, SECTION_ID_STREAM_GROUP);
+    writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP);
     print_int("index", stg->index);
     if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS) print_fmt    ("id", "0x%"PRIx64, stg->id);
     else                                          print_str_opt("id", "N/A");
     print_int("nb_streams", stg->nb_streams);
-    print_stream_group_params(w, stg);
+    if (stg->type != AV_STREAM_GROUP_PARAMS_NONE)
+        print_str("type", av_x_if_null(avformat_stream_group_name(stg->type), "unknown"));
+    else
+        print_str_opt("type", "unknown");
+    if (do_show_stream_group_components)
+        print_stream_group_params(w, stg);
 
     /* Print disposition information */
     if (do_show_stream_group_disposition)
@@ -4439,6 +4475,7 @@ int main(int argc, char **argv)
     SET_DO_SHOW(PROGRAMS, programs);
     SET_DO_SHOW(STREAM_GROUP_DISPOSITION, stream_group_disposition);
     SET_DO_SHOW(STREAM_GROUPS, stream_groups);
+    SET_DO_SHOW(STREAM_GROUP_COMPONENTS, stream_group_components);
     SET_DO_SHOW(STREAMS, streams);
     SET_DO_SHOW(STREAM_DISPOSITION, stream_disposition);
     SET_DO_SHOW(PROGRAM_STREAM_DISPOSITION, stream_disposition);
diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index 49077ecfb3..6dc5b5f5af 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -166,19 +166,19 @@ fate-mov-heic-demux-still-image-multiple-items: CMD = framecrc -i $(TARGET_SAMPL
 FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \
                            += fate-mov-heic-demux-still-image-grid
 fate-mov-heic-demux-still-image-grid: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/C007.heic "" "-c:v copy -map 0:g:0" \
-  "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition"
+  "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition"
 
 # heic demuxing - still image with multiple items in an overlay canvas.
 FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \
                            += fate-mov-heic-demux-still-image-iovl
 fate-mov-heic-demux-still-image-iovl: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/C015.heic "" "-c:v copy -map 0:g:0" \
-  "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition"
+  "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition"
 
 # heic demuxing - still image where one image item is placed twice on an overlay canvas.
 FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \
                            += fate-mov-heic-demux-still-image-iovl-2
 fate-mov-heic-demux-still-image-iovl-2: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/C021.heic "" "-c:v copy -map 0:g:0" \
-  "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition"
+  "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition"
 
 # Resulting remux should have:
 # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED
diff --git a/tests/ref/fate/mov-heic-demux-still-image-grid b/tests/ref/fate/mov-heic-demux-still-image-grid
index b15ce91e1a..d8dfccea8f 100644
--- a/tests/ref/fate/mov-heic-demux-still-image-grid
+++ b/tests/ref/fate/mov-heic-demux-still-image-grid
@@ -31,6 +31,35 @@ index=0
 id=0x3f1
 nb_streams=4
 type=Tile Grid
+[COMPONENT]
+nb_tiles=4
+coded_width=2560
+coded_height=1440
+horizontal_offset=0
+vertical_offset=0
+width=2560
+height=1440
+[SUBCOMPONENT]
+stream_index=0
+tile_horizontal_offset=0
+tile_vertical_offset=0
+[/SUBCOMPONENT]
+[SUBCOMPONENT]
+stream_index=1
+tile_horizontal_offset=1280
+tile_vertical_offset=0
+[/SUBCOMPONENT]
+[SUBCOMPONENT]
+stream_index=2
+tile_horizontal_offset=0
+tile_vertical_offset=720
+[/SUBCOMPONENT]
+[SUBCOMPONENT]
+stream_index=3
+tile_horizontal_offset=1280
+tile_vertical_offset=720
+[/SUBCOMPONENT]
+[/COMPONENT]
 DISPOSITION:default=1
 DISPOSITION:dub=0
 DISPOSITION:original=0
diff --git a/tests/ref/fate/mov-heic-demux-still-image-iovl b/tests/ref/fate/mov-heic-demux-still-image-iovl
index 113b251c00..2b211267a4 100644
--- a/tests/ref/fate/mov-heic-demux-still-image-iovl
+++ b/tests/ref/fate/mov-heic-demux-still-image-iovl
@@ -17,6 +17,25 @@ index=0
 id=0x3ee
 nb_streams=2
 type=Tile Grid
+[COMPONENT]
+nb_tiles=2
+coded_width=1440
+coded_height=960
+horizontal_offset=0
+vertical_offset=0
+width=1440
+height=960
+[SUBCOMPONENT]
+stream_index=0
+tile_horizontal_offset=0
+tile_vertical_offset=0
+[/SUBCOMPONENT]
+[SUBCOMPONENT]
+stream_index=1
+tile_horizontal_offset=160
+tile_vertical_offset=240
+[/SUBCOMPONENT]
+[/COMPONENT]
 DISPOSITION:default=0
 DISPOSITION:dub=0
 DISPOSITION:original=0
diff --git a/tests/ref/fate/mov-heic-demux-still-image-iovl-2 b/tests/ref/fate/mov-heic-demux-still-image-iovl-2
index 8ee3543e43..492f404a3c 100644
--- a/tests/ref/fate/mov-heic-demux-still-image-iovl-2
+++ b/tests/ref/fate/mov-heic-demux-still-image-iovl-2
@@ -10,6 +10,25 @@ index=0
 id=0x3eb
 nb_streams=1
 type=Tile Grid
+[COMPONENT]
+nb_tiles=2
+coded_width=640
+coded_height=360
+horizontal_offset=0
+vertical_offset=0
+width=640
+height=360
+[SUBCOMPONENT]
+stream_index=0
+tile_horizontal_offset=0
+tile_vertical_offset=0
+[/SUBCOMPONENT]
+[SUBCOMPONENT]
+stream_index=0
+tile_horizontal_offset=64896
+tile_vertical_offset=65176
+[/SUBCOMPONENT]
+[/COMPONENT]
 DISPOSITION:default=0
 DISPOSITION:dub=0
 DISPOSITION:original=0