From: Stefano Sabatini <stefasab@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 6/9] fftools/ffprobe: export Tile Grid Stream Group parameters
Date: Tue, 5 Mar 2024 16:21:29 +0100
Message-ID: <Zec4eeanoprXHzjw@mariano> (raw)
In-Reply-To: <20240305000033.10379-6-jamrial@gmail.com>
On date Monday 2024-03-04 21:00:26 -0300, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> fftools/ffprobe.c | 41 ++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 36 insertions(+), 5 deletions(-)
>
> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
> index ff05c4c1db..e736023bcd 100644
> --- a/fftools/ffprobe.c
> +++ b/fftools/ffprobe.c
> @@ -209,6 +209,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_PIECES,
> + SECTION_ID_STREAM_GROUP_PIECE,
> SECTION_ID_STREAM_GROUP_STREAMS,
> SECTION_ID_STREAM_GROUP_STREAM,
> SECTION_ID_STREAM_GROUP_DISPOSITION,
> @@ -282,8 +286,8 @@ static struct section sections[] = {
> [SECTION_ID_FRAME_SIDE_DATA_TIMECODE] = { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, "timecode", 0, { -1 } },
> [SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST] = { SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST, "components", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_COMPONENT, -1 }, .element_name = "component", .unique_name = "frame_side_data_components" },
> [SECTION_ID_FRAME_SIDE_DATA_COMPONENT] = { SECTION_ID_FRAME_SIDE_DATA_COMPONENT, "component", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, -1 }, .unique_name = "frame_side_data_component", .element_name = "component_entry", .get_type = get_raw_string_type },
> - [SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST] = { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_PIECE, -1 }, .element_name = "piece" },
> - [SECTION_ID_FRAME_SIDE_DATA_PIECE] = { SECTION_ID_FRAME_SIDE_DATA_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "piece_entry", .get_type = get_raw_string_type },
> + [SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST] = { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_PIECE, -1 }, .element_name = "piece", .unique_name = "frame_side_data_pieces" },
> + [SECTION_ID_FRAME_SIDE_DATA_PIECE] = { SECTION_ID_FRAME_SIDE_DATA_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "piece_entry", .unique_name = "frame_side_data_piece", .get_type = get_raw_string_type },
> [SECTION_ID_FRAME_LOGS] = { SECTION_ID_FRAME_LOGS, "logs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_LOG, -1 } },
> [SECTION_ID_FRAME_LOG] = { SECTION_ID_FRAME_LOG, "log", 0, { -1 }, },
> [SECTION_ID_LIBRARY_VERSIONS] = { SECTION_ID_LIBRARY_VERSIONS, "library_versions", SECTION_FLAG_IS_ARRAY, { SECTION_ID_LIBRARY_VERSION, -1 } },
> @@ -309,7 +313,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", SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_TAGS, SECTION_ID_STREAM_GROUP_DISPOSITION, SECTION_ID_STREAM_GROUP_COMPONENTS, SECTION_ID_STREAM_GROUP_STREAMS, -1 }, .get_type = get_stream_group_type },
> + [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_PIECES, -1 }, .unique_name = "stream_group_component", .element_name = "component_entry", .get_type = get_raw_string_type },
> + [SECTION_ID_STREAM_GROUP_PIECES] = { SECTION_ID_STREAM_GROUP_PIECES, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_PIECE, -1 }, .element_name = "piece", .unique_name = "stream_group_pieces" },
> + [SECTION_ID_STREAM_GROUP_PIECE] = { SECTION_ID_STREAM_GROUP_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "piece_entry", .unique_name = "stream_group_piece", .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" },
> @@ -3388,9 +3396,32 @@ static int show_programs(WriterContext *w, InputFile *ifile)
> static void print_stream_group_params(WriterContext *w, AVStreamGroup *stg)
> {
> const char *unknown = "unknown";
> - if (stg->type != AV_STREAM_GROUP_PARAMS_NONE)
> + if (stg->type != AV_STREAM_GROUP_PARAMS_NONE) {
> print_str("type", av_x_if_null(avformat_stream_group_name(stg->type), unknown));
nit: you can avoid the indent if you check the NONE case and return
immediately in that case
> - else
> + if (stg->type == AV_STREAM_GROUP_PARAMS_TILE_GRID) {
> + AVStreamGroupTileGrid *tile_grid = stg->params.tile_grid;
> + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_COMPONENTS);
> + writer_print_section_header(w, "parameters", 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_PIECES);
> + for (int i = 0; i < tile_grid->nb_tiles; i++) {
> + writer_print_section_header(w, "tile_offset", SECTION_ID_STREAM_GROUP_PIECE);
> + 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);
> + writer_print_section_footer(w);
> + }
> + } else
> print_str_opt("type", unknown);
> }
LGTM, thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-03-05 15:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 0:00 [FFmpeg-devel] [PATCH 1/9 v2] fftools/ffprobe: fix printing side data components and pieces James Almer
2024-03-05 0:00 ` [FFmpeg-devel] [PATCH 2/9] avformat/avformat: add a function to return the name of stream groups James Almer
2024-03-05 14:50 ` Stefano Sabatini
2024-03-05 14:52 ` Stefano Sabatini
2024-03-05 14:56 ` James Almer
2024-03-05 0:00 ` [FFmpeg-devel] [PATCH 3/9 v3] fftools/ffprobe: add support for Stream Groups James Almer
2024-03-05 15:06 ` Stefano Sabatini
2024-03-05 15:09 ` James Almer
2024-03-05 0:00 ` [FFmpeg-devel] [PATCH 4/9 v2] fate/iamf: print stream group information James Almer
2024-03-05 15:10 ` Stefano Sabatini
2024-03-05 0:00 ` [FFmpeg-devel] [PATCH 5/9 v2] fate/mov: print stream group information for iamf tests James Almer
2024-03-05 15:14 ` Stefano Sabatini
2024-03-05 0:00 ` [FFmpeg-devel] [PATCH 6/9] fftools/ffprobe: export Tile Grid Stream Group parameters James Almer
2024-03-05 15:14 ` James Almer
2024-03-05 15:24 ` Stefano Sabatini
2024-03-05 15:50 ` James Almer
2024-03-06 13:39 ` Stefano Sabatini
2024-03-05 15:21 ` Stefano Sabatini [this message]
2024-03-05 0:00 ` [FFmpeg-devel] [PATCH 7/9 v3] fate/mov: print stream group information for avif/heic tests James Almer
2024-03-05 0:00 ` [FFmpeg-devel] [PATCH 8/9 v2] fate/mov: use framecrc for the remaining " James Almer
2024-03-05 0:00 ` [FFmpeg-devel] [PATCH 9/9] fate/mov: add a heic test with a derived image using a single item twice James Almer
2024-03-05 14:46 ` [FFmpeg-devel] [PATCH 1/9 v2] fftools/ffprobe: fix printing side data components and pieces Stefano Sabatini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zec4eeanoprXHzjw@mariano \
--to=stefasab@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git