From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 2/2] fftools/ffprobe: export IAMF Stream Group parameters
Date: Thu, 7 Mar 2024 14:49:05 -0300
Message-ID: <e4cc6e17-8afa-4a29-9680-b94f2dc0d368@gmail.com> (raw)
In-Reply-To: <ZenvP2gKPmJTLTqX@mariano>
On 3/7/2024 1:45 PM, Stefano Sabatini wrote:
> On date Wednesday 2024-03-06 21:49:52 -0300, James Almer wrote:
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>> fftools/ffprobe.c | 157 +++++++++++++++++++++++-
>> tests/fate/iamf.mak | 8 +-
>> tests/fate/mov.mak | 8 +-
>> tests/ref/fate/iamf-5_1_4 | 92 ++++++++++++++
>> tests/ref/fate/iamf-7_1_4 | 92 ++++++++++++++
>> tests/ref/fate/iamf-ambisonic_1 | 39 ++++++
>> tests/ref/fate/iamf-stereo | 67 ++++++++++
>> tests/ref/fate/mov-mp4-iamf-5_1_4 | 92 ++++++++++++++
>> tests/ref/fate/mov-mp4-iamf-7_1_4 | 92 ++++++++++++++
>> tests/ref/fate/mov-mp4-iamf-ambisonic_1 | 39 ++++++
>> tests/ref/fate/mov-mp4-iamf-stereo | 67 ++++++++++
>> 11 files changed, 741 insertions(+), 12 deletions(-)
>>
>> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
>> index c2ed8336f9..393f8d2a99 100644
>> --- a/fftools/ffprobe.c
>> +++ b/fftools/ffprobe.c
>> @@ -41,6 +41,7 @@
>> #include "libavutil/display.h"
>> #include "libavutil/hash.h"
>> #include "libavutil/hdr_dynamic_metadata.h"
>> +#include "libavutil/iamf.h"
>> #include "libavutil/mastering_display_metadata.h"
>> #include "libavutil/hdr_dynamic_vivid_metadata.h"
>> #include "libavutil/dovi_meta.h"
>> @@ -214,6 +215,12 @@ typedef enum {
>> SECTION_ID_STREAM_GROUP_COMPONENT,
>> SECTION_ID_STREAM_GROUP_SUB_COMPONENTS,
>> SECTION_ID_STREAM_GROUP_SUB_COMPONENT,
>> + SECTION_ID_STREAM_GROUP_PIECES,
>> + SECTION_ID_STREAM_GROUP_PIECE,
>> + SECTION_ID_STREAM_GROUP_SUB_PIECES,
>> + SECTION_ID_STREAM_GROUP_SUB_PIECE,
>> + SECTION_ID_STREAM_GROUP_BLOCKS,
>> + SECTION_ID_STREAM_GROUP_BLOCK,
>> SECTION_ID_STREAM_GROUP_STREAMS,
>> SECTION_ID_STREAM_GROUP_STREAM,
>> SECTION_ID_STREAM_GROUP_DISPOSITION,
>> @@ -287,8 +294,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 } },
>> @@ -318,7 +325,13 @@ static struct section sections[] = {
>> [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_SUB_COMPONENTS, -1 }, .unique_name = "stream_group_component", .element_name = "component_entry", .get_type = get_stream_group_type },
>> [SECTION_ID_STREAM_GROUP_SUB_COMPONENTS] = { SECTION_ID_STREAM_GROUP_SUB_COMPONENTS, "subcomponents", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_SUB_COMPONENT, -1 }, .element_name = "component" },
>> - [SECTION_ID_STREAM_GROUP_SUB_COMPONENT] = { SECTION_ID_STREAM_GROUP_SUB_COMPONENT, "subcomponent", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "sub_component_entry", .get_type = get_raw_string_type },
>
>> + [SECTION_ID_STREAM_GROUP_SUB_COMPONENT] = { SECTION_ID_STREAM_GROUP_SUB_COMPONENT, "subcomponent", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_PIECES, -1 }, .element_name = "subcomponent_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, { SECTION_ID_STREAM_GROUP_SUB_PIECES, -1 }, .unique_name = "stream_group_piece", .element_name = "piece_entry", .get_type = get_raw_string_type },
>> + [SECTION_ID_STREAM_GROUP_SUB_PIECES] = { SECTION_ID_STREAM_GROUP_SUB_PIECES, "subpieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_SUB_PIECE, -1 }, .element_name = "subpiece" },
>> + [SECTION_ID_STREAM_GROUP_SUB_PIECE] = { SECTION_ID_STREAM_GROUP_SUB_PIECE, "subpiece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_BLOCKS, -1 }, .element_name = "subpiece_entry", .get_type = get_raw_string_type },
>
> consistencty: I'd go with SUBPIECE/subpiece everywhere, also missing
> doc/ffprobe.xsd update
>
>> + [SECTION_ID_STREAM_GROUP_BLOCKS] = { SECTION_ID_STREAM_GROUP_BLOCKS, "blocks", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_BLOCK, -1 }, .element_name = "block" },
>> + [SECTION_ID_STREAM_GROUP_BLOCK] = { SECTION_ID_STREAM_GROUP_BLOCK, "block", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "block_entry", .get_type = get_raw_string_type },
>
> where are these used?
In print_iamf_param_definition(), where sections[] is checked for the
child section of the input section_id, they'd be used when called by
print_iamf_submix_params().
Can add a comment so it doesn't look like they are unused, because the
tests currently doesn't cover it.
_______________________________________________
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-07 17:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 0:49 [FFmpeg-devel] [PATCH 1/2 v2] fftools/ffprobe: export Tile Grid " James Almer
2024-03-07 0:49 ` [FFmpeg-devel] [PATCH 2/2] fftools/ffprobe: export IAMF " James Almer
2024-03-07 16:45 ` Stefano Sabatini
2024-03-07 17:49 ` James Almer [this message]
2024-03-07 16:17 ` [FFmpeg-devel] [PATCH 1/2 v2] fftools/ffprobe: export Tile Grid " Stefano Sabatini
2024-03-07 16:46 ` Stefano Sabatini
2024-03-07 17:53 ` James Almer
2024-03-07 17:52 ` James Almer
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=e4cc6e17-8afa-4a29-9680-b94f2dc0d368@gmail.com \
--to=jamrial@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