From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 39EA149244 for ; Thu, 7 Mar 2024 17:49:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4075968CB1D; Thu, 7 Mar 2024 19:49:00 +0200 (EET) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6077D68C5A4 for ; Thu, 7 Mar 2024 19:48:53 +0200 (EET) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5cdbc4334edso745092a12.3 for ; Thu, 07 Mar 2024 09:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709833731; x=1710438531; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=S/7bEIMYhoavvJSdxmsIp0yo3E2FwYOq6wD3SJrCEc0=; b=CRGDyAr1YZW1iLHdD+3dUaHqxmOiM2L58b8JtrAPxJNfq9+iJFZng2UFQxydWF8Mpb cWp0ES83HM2qs3z7hFys1+TTYBqpw+Ol2hovpeQc9JRpqZaq3a9YBQjCIYdum+/bEHL1 3gEkyf+yNi2iJ/OvEDAO/3YKaLf2kEHYvDg+cgTRnveIgT6wWRQA3bkLpH8YLWfKH0vx ps4FShFtsegpP+yh09uQSoHZoK8bfqrfdI4cvGIB2kE0//99YP680oRqXuWcZy3r85sR t1xFvpJaUgLZg10doznI2vHm534rCSHwR7I/AuFVyu4fI71/yCVzImROPpM4ukhmipj9 mlng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709833731; x=1710438531; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=S/7bEIMYhoavvJSdxmsIp0yo3E2FwYOq6wD3SJrCEc0=; b=CK0KPhynSH+chXhl7y3c3X4hIgkl7fD7WHXc3zWvPYNVjyNl25X1djX6tM67eSGhZn VDajGZ1fRHAN2w4AGyxjj3ZD7tvGM0+XwVA9OgJqKl7b010ADb89axU/wMCpAiU97Ahv +TiA7d2q9CeRlMAFYl1EhX1LMpzw2u/Np+CiuZ7yhweHOg+3Xxh1/XV58Ep+y3ZWbfEX TyTm7kV2MbaBFB5QW1M/+0sVbK9/itqtkux8yU0ynLceboZAV30J3LmFbGFiTEKoVKLA uhl/NK/AD3hjMoOZYWLZLE7kKUW1fUigFByd+MfpBJnNTabxz4/uWh1ac2CmTIM2GmWO U2pw== X-Gm-Message-State: AOJu0Yx0e65A/64QukizowymoKngnr+t82rEzDXE1R5h7TKh7hllnIsf ubLvRKU73hnHoFM4DImohlM9FIa6eu8KMYdIGpbgfNJFBX44iVcvwtJbn+ty X-Google-Smtp-Source: AGHT+IHTiE67GF+pVE6O+58/lqN1dc5q7V6md+hLPNkpSwMs5AjtwbE+rjb+1BUZrekw2xgW1Mgm7Q== X-Received: by 2002:a05:6a20:1611:b0:1a1:490f:25b2 with SMTP id l17-20020a056a20161100b001a1490f25b2mr10257124pzj.13.1709833730529; Thu, 07 Mar 2024 09:48:50 -0800 (PST) Received: from [192.168.0.14] ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id h1-20020a056a00170100b006e64bf2261asm3356992pfc.104.2024.03.07.09.48.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 Mar 2024 09:48:50 -0800 (PST) Message-ID: Date: Thu, 7 Mar 2024 14:49:05 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240307004952.9417-1-jamrial@gmail.com> <20240307004952.9417-2-jamrial@gmail.com> From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 2/2] fftools/ffprobe: export IAMF Stream Group parameters X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 >> --- >> 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".