diff --git a/tests/test_000000_3.textproto b/tests/test_000000_3.textproto index 5e512e27..0e1c3bf6 100644 --- a/tests/test_000000_3.textproto +++ b/tests/test_000000_3.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -17,7 +17,11 @@ test_vector_metadata { "frame incorrectly has fewer samples than all other frames because it does " "not have sufficient `num_samples_to_trim_at_end`." file_name_prefix: "test_000000_3" + # Typically the encoder would not produce partial frames. The correct way to + # signal an incomplete frame is to produce a full Audio Frame OBU, but with + # `num_samples_to_trim_at_end` signalled. is_valid: false + # The decoder can reject the bitstream because the final frame is invalid. is_valid_to_decode: false validate_user_loudness: true mp4_fixed_timestamp: "2023-04-06 00:00:00" @@ -34,6 +38,11 @@ test_vector_metadata { base_test: "None" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -43,7 +52,7 @@ codec_config_metadata { codec_config_id: 200 codec_config { codec_id: CODEC_ID_LPCM - num_samples_per_frame: 128 + num_samples_per_frame: 64 audio_roll_distance: 0 decoder_config_lpcm { sample_format_flags: LPCM_LITTLE_ENDIAN @@ -58,11 +67,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -79,12 +85,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -110,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -128,13 +130,36 @@ mix_presentation_metadata { } } +# There are 8000 samples, with 64 samples per frame. The last frame does not +# need padding. audio_frame_metadata { wav_filename: "sawtooth_100_stereo.wav" samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] +} + +arbitrary_obu_metadata { + invalidates_bitstream: true + insertion_hook: INSERTION_HOOK_AFTER_AUDIO_FRAMES_AT_TICK + # Insert a buggy audio frame after all of the real audio frames. + insertion_tick: 8000 + obu_type: OBU_IA_AUDIO_FRAME_ID_0 + # `CodecConfigObu::num_samples_per_frame` signals a real audio frame must have + # 64 samples (for each channel). + payload: + "in" # 0th left sample. + "co" # 0th right sample. + "mp" # 1st left sample. + "le" # 1st right sample. + "te" # 2nd left sample. + "fr" # 2nd right sample. + "am" # 3rd left sample. + "e " # 3rd right sample. } temporal_delimiter_metadata { diff --git a/tests/test_000002.textproto b/tests/test_000002.textproto index a8e0b603..01cfd654 100644 --- a/tests/test_000002.textproto +++ b/tests/test_000002.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -42,6 +42,11 @@ test_vector_metadata { base_test: "test_000000_3" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -66,11 +71,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -87,12 +89,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -118,7 +117,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -141,15 +139,16 @@ audio_frame_metadata { samples_to_trim_at_end: 64 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8064 - num_subblocks: 1 constant_subblock_duration: 8064 subblocks: [ { diff --git a/tests/test_000002_f.mp4 b/tests/test_000002_f.mp4 index 6ea96ffe..00147a98 100644 Binary files a/tests/test_000002_f.mp4 and b/tests/test_000002_f.mp4 differ diff --git a/tests/test_000003.textproto b/tests/test_000003.textproto index 1cd6594e..c60689d7 100644 --- a/tests/test_000003.textproto +++ b/tests/test_000003.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -42,6 +42,11 @@ test_vector_metadata { base_test: "None" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -66,11 +71,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -87,12 +89,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -118,7 +117,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -141,8 +139,10 @@ audio_frame_metadata { samples_to_trim_at_end: 64 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000003_f.mp4 b/tests/test_000003_f.mp4 index 78dda541..d25a7f6c 100644 Binary files a/tests/test_000003_f.mp4 and b/tests/test_000003_f.mp4 differ diff --git a/tests/test_000005.textproto b/tests/test_000005.textproto index 6fa92203..4bcf66bf 100644 --- a/tests/test_000005.textproto +++ b/tests/test_000005.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000002" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +125,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000005_f.mp4 b/tests/test_000005_f.mp4 index 309da50a..f81a00a1 100644 Binary files a/tests/test_000005_f.mp4 and b/tests/test_000005_f.mp4 differ diff --git a/tests/test_000006.textproto b/tests/test_000006.textproto index d65833c1..085408e4 100644 --- a/tests/test_000006.textproto +++ b/tests/test_000006.textproto @@ -8,13 +8,13 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { human_readable_description: - "A stereo base profile IAMF stream with temporal " - "delimiters." + "A stereo Base profile IAMF stream with temporal " + " delimiters." file_name_prefix: "test_000006" is_valid: true is_valid_to_decode: true @@ -30,11 +30,16 @@ test_vector_metadata { "4.2/temporal_delimiter_obu", "5.1/IA Sequence", "5.1.2/IA Data OBUs", - "6.2.4/temporal_delimiter_obu" + "4.2/Temporal Delimiter OBU" ] base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_BASE additional_profile: PROFILE_VERSION_BASE @@ -59,11 +64,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -80,12 +82,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -111,7 +110,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -134,15 +132,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000006_f.mp4 b/tests/test_000006_f.mp4 index 4354feac..609517a3 100644 Binary files a/tests/test_000006_f.mp4 and b/tests/test_000006_f.mp4 differ diff --git a/tests/test_000007.textproto b/tests/test_000007.textproto index dc8eba88..8a70dcd7 100644 --- a/tests/test_000007.textproto +++ b/tests/test_000007.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,8 +28,33 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + +# Insert a buggy IA Sequence header beforee the descriptors. +arbitrary_obu_metadata { + invalidates_bitstream: true + insertion_hook: INSERTION_HOOK_BEFORE_DESCRIPTORS + obu_type: OBU_IA_SEQUENCE_HEADER + obu_header { + obu_redundant_copy: false + obu_trimming_status_flag: false + obu_extension_flag: false + } + payload: + "IAMF" # Invalid because `ia_code` is case-sensitive. + "\x00" # `primary_profile`. + "\x00" # `additional_profile`. +} + +# Usually the encoder needs a real IA Sequence header, insert a valid one with +# `obu_redundant_copy` set to true. ia_sequence_header_metadata { - ia_code: 0x49414d46 # "IAMF" + obu_header { + obu_redundant_copy: true + } primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE } @@ -53,11 +78,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -74,12 +96,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -105,7 +124,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -128,15 +146,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000012.textproto b/tests/test_000012.textproto index a1be53e1..b4261245 100644 --- a/tests/test_000012.textproto +++ b/tests/test_000012.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +125,16 @@ audio_frame_metadata { samples_to_trim_at_end: 2 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000012_f.mp4 b/tests/test_000012_f.mp4 index 9e68f32a..ff4e73fc 100644 Binary files a/tests/test_000012_f.mp4 and b/tests/test_000012_f.mp4 differ diff --git a/tests/test_000013.textproto b/tests/test_000013.textproto index e327c461..dd6e46d4 100644 --- a/tests/test_000013.textproto +++ b/tests/test_000013.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +125,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 3 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000013_f.mp4 b/tests/test_000013_f.mp4 index c6d69c8b..41987ab1 100644 Binary files a/tests/test_000013_f.mp4 and b/tests/test_000013_f.mp4 differ diff --git a/tests/test_000014.textproto b/tests/test_000014.textproto index a40f3f63..68271478 100644 --- a/tests/test_000014.textproto +++ b/tests/test_000014.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -29,7 +29,11 @@ test_vector_metadata { "3.11.1/pre_skip" ] base_test: "test_000005" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -43,9 +47,11 @@ codec_config_metadata { codec_id: CODEC_ID_OPUS num_samples_per_frame: 120 audio_roll_distance: -32 + # Prevent encoder from overriding the invalid `pre_skip` value. + automatically_override_codec_delay: false decoder_config_opus { version: 1 - pre_skip: 0 + pre_skip: 0 # Intentionally set to an invalid value. input_sample_rate: 48000 opus_encoder_metadata { target_bitrate_per_channel: 48000 @@ -61,11 +67,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -82,12 +85,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -113,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -136,15 +135,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 96000 - num_subblocks: 1 constant_subblock_duration: 96000 subblocks: [ { diff --git a/tests/test_000015.iamf b/tests/test_000015.iamf index de24ef10..c6142f87 100644 Binary files a/tests/test_000015.iamf and b/tests/test_000015.iamf differ diff --git a/tests/test_000015.textproto b/tests/test_000015.textproto index 999f2be0..fd36175d 100644 --- a/tests/test_000015.textproto +++ b/tests/test_000015.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +125,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { @@ -151,8 +150,10 @@ parameter_block_metadata { ] } +# Place the extra parameter block in the first temporal unit. arbitrary_obu_metadata { - insertion_hook: INSERTION_HOOK_AFTER_DESCRIPTORS + insertion_hook: INSERTION_HOOK_AFTER_PARAMETER_BLOCKS_AT_TICK + insertion_tick: 0 obu_type: OBU_IA_PARAMETER_BLOCK obu_header { obu_redundant_copy: false diff --git a/tests/test_000015_f.mp4 b/tests/test_000015_f.mp4 index 7f1c942b..b206d2f7 100644 Binary files a/tests/test_000015_f.mp4 and b/tests/test_000015_f.mp4 differ diff --git a/tests/test_000015_s.mp4 b/tests/test_000015_s.mp4 index f6a8a1ff..12669e62 100644 Binary files a/tests/test_000015_s.mp4 and b/tests/test_000015_s.mp4 differ diff --git a/tests/test_000016.textproto b/tests/test_000016.textproto index 3ca374e2..d2d5aa27 100644 --- a/tests/test_000016.textproto +++ b/tests/test_000016.textproto @@ -8,20 +8,20 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { human_readable_description: "A stereo IAMF stream. It has a parameter block not aligned with the audio " - "frames, ending 100 samples earlier. This is invalid because parameter " + "frames, ending one frame earlier. This is invalid because parameter " "blocks should cover the whole duration of the audio frames that use the " "parameter." file_name_prefix: "test_000016" is_valid: false is_valid_to_decode: false validate_user_loudness: true - mp4_fixed_timestamp: "2023-04-19 00:00:00" + mp4_fixed_timestamp: "2024-12-17 00:00:00" test_repository_tags: [ "github/aomediacodec/libiamf/main", "github/aomediacodec/libiamf/v1.0.0-errata" @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -45,12 +50,12 @@ codec_config_metadata { codec_config_id: 200 codec_config { codec_id: CODEC_ID_LPCM - num_samples_per_frame: 64 + num_samples_per_frame: 4 audio_roll_distance: 0 decoder_config_lpcm { sample_format_flags: LPCM_LITTLE_ENDIAN sample_size: 16 - sample_rate: 16000 + sample_rate: 48000 } } } @@ -60,11 +65,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -81,12 +83,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -95,10 +94,12 @@ mix_presentation_metadata { } element_mix_gain { param_definition { - parameter_id: 100 - parameter_rate: 16000 - param_definition_mode: 1 + parameter_id: 127 + parameter_rate: 48000 + param_definition_mode: 0 reserved: 0 + duration: 4 + constant_subblock_duration: 4 } default_mix_gain: 0 } @@ -106,13 +107,12 @@ mix_presentation_metadata { output_mix_gain { param_definition { parameter_id: 100 - parameter_rate: 16000 + parameter_rate: 48000 param_definition_mode: 1 reserved: 0 } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -123,40 +123,45 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -13733 - digital_peak: -12879 + integrated_loudness: -32768 + digital_peak: -32768 } } } } audio_frame_metadata { - wav_filename: "sawtooth_100_stereo.wav" + wav_filename: "stereo_8_samples_48khz_s16le.wav" samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } -parameter_block_metadata { - parameter_id: 100 - start_timestamp: 0 - duration: 7900 - num_subblocks: 1 - constant_subblock_duration: 7900 - subblocks: [ - { - mix_gain_parameter_data { - animation_type: ANIMATE_STEP - param_data { - step { - start_point_value: 0 - } - } - } - } - ] +arbitrary_obu_metadata { + # There are two frames of audio, but only one parameter block. Normally, + # a given `parameter_id` cover the whole duration of the audio frames or be + # entirely absent. + invalidates_bitstream: true + insertion_hook: INSERTION_HOOK_AFTER_PARAMETER_BLOCKS_AT_TICK + insertion_tick: 0 + obu_type: OBU_IA_PARAMETER_BLOCK + obu_header { + obu_redundant_copy: false + obu_trimming_status_flag: false + obu_extension_flag: false + } + + payload: + # `parameter_id` (127)`. + "\x7f" + # `animation_type` = `ANIMATE_STEP`. + "\x00" + # `start_point_value` + "\xbb\xcc" } temporal_delimiter_metadata { diff --git a/tests/test_000017.textproto b/tests/test_000017.textproto index 41df17a4..b46f080c 100644 --- a/tests/test_000017.textproto +++ b/tests/test_000017.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -16,8 +16,7 @@ test_vector_metadata { "A stereo IAMF stream. It has one frame of samples fully trimmed off the " "end." file_name_prefix: "test_000017" - # TODO(b/356905554): Allow encoding fully trimmed frames. - is_valid: false + is_valid: true is_valid_to_decode: true validate_user_loudness: true mp4_fixed_timestamp: "2023-04-19 00:00:00" @@ -32,6 +31,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -56,11 +60,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -77,12 +78,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -108,7 +106,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -128,18 +125,19 @@ mix_presentation_metadata { audio_frame_metadata { wav_filename: "sawtooth_100_stereo.wav" - samples_to_trim_at_end: 64 # Trimming a full frame; invalid. + samples_to_trim_at_end: 64 # Trimming a full frame. samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000017_f.mp4 b/tests/test_000017_f.mp4 index 9aa9cbad..24abbb5d 100644 Binary files a/tests/test_000017_f.mp4 and b/tests/test_000017_f.mp4 differ diff --git a/tests/test_000018.textproto b/tests/test_000018.textproto index 12f6189e..c3f83844 100644 --- a/tests/test_000018.textproto +++ b/tests/test_000018.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [37] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +125,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000018_f.mp4 b/tests/test_000018_f.mp4 index bb7f88dd..6b3ae03e 100644 Binary files a/tests/test_000018_f.mp4 and b/tests/test_000018_f.mp4 differ diff --git a/tests/test_000019.textproto b/tests/test_000019.textproto index c9aa4cae..769d17df 100644 --- a/tests/test_000019.textproto +++ b/tests/test_000019.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +125,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 3200 - num_subblocks: 1 constant_subblock_duration: 3200 subblocks: [ { @@ -155,7 +154,6 @@ parameter_block_metadata { parameter_id: 100 start_timestamp: 3200 duration: 4800 - num_subblocks: 1 constant_subblock_duration: 4800 subblocks: [ { diff --git a/tests/test_000019_f.mp4 b/tests/test_000019_f.mp4 index 309da50a..f81a00a1 100644 Binary files a/tests/test_000019_f.mp4 and b/tests/test_000019_f.mp4 differ diff --git a/tests/test_000020.iamf b/tests/test_000020.iamf index 978ec780..2a58a72d 100644 Binary files a/tests/test_000020.iamf and b/tests/test_000020.iamf differ diff --git a/tests/test_000020.textproto b/tests/test_000020.textproto index e5151ff6..173a20e4 100644 --- a/tests/test_000020.textproto +++ b/tests/test_000020.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,7 +32,11 @@ test_vector_metadata { "6.2.2/roll" ] base_test: "test_000014" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -64,11 +68,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -85,12 +86,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -116,7 +114,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -139,15 +136,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000020_f.mp4 b/tests/test_000020_f.mp4 index f0f9c641..68235473 100644 Binary files a/tests/test_000020_f.mp4 and b/tests/test_000020_f.mp4 differ diff --git a/tests/test_000020_s.mp4 b/tests/test_000020_s.mp4 index d6c355fa..bc56f526 100644 Binary files a/tests/test_000020_s.mp4 and b/tests/test_000020_s.mp4 differ diff --git a/tests/test_000021.iamf b/tests/test_000021.iamf index 4833b531..c04e1cce 100644 Binary files a/tests/test_000021.iamf and b/tests/test_000021.iamf differ diff --git a/tests/test_000021.textproto b/tests/test_000021.textproto index 2a4dffd9..d2cdea4c 100644 --- a/tests/test_000021.textproto +++ b/tests/test_000021.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "3.11.1/num_samples_per_frame" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,11 +67,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -84,12 +85,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -115,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -138,15 +135,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000021_f.mp4 b/tests/test_000021_f.mp4 index b6a390a3..0c0309d2 100644 Binary files a/tests/test_000021_f.mp4 and b/tests/test_000021_f.mp4 differ diff --git a/tests/test_000021_s.mp4 b/tests/test_000021_s.mp4 index 8f5fcd9f..ddf0e76b 100644 Binary files a/tests/test_000021_s.mp4 and b/tests/test_000021_s.mp4 differ diff --git a/tests/test_000022.textproto b/tests/test_000022.textproto index 1c953078..dbaeff17 100644 --- a/tests/test_000022.textproto +++ b/tests/test_000022.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "3.11.1/num_samples_per_frame" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -44,6 +48,8 @@ codec_config_metadata { codec_config { codec_id: CODEC_ID_OPUS num_samples_per_frame: 960 + # Prevent encoder from overriding the invalid `audio_roll_distance` value. + automatically_override_audio_roll_distance: false audio_roll_distance: -5 decoder_config_opus { version: 1 @@ -63,11 +69,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -84,12 +87,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -115,7 +115,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -138,15 +137,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000023.iamf b/tests/test_000023.iamf index cac3a535..70454d0d 100644 Binary files a/tests/test_000023.iamf and b/tests/test_000023.iamf differ diff --git a/tests/test_000023.textproto b/tests/test_000023.textproto index 5be747ad..7be63c54 100644 --- a/tests/test_000023.textproto +++ b/tests/test_000023.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "3.11.1/num_samples_per_frame" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,11 +67,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -84,12 +85,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -115,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -138,15 +135,16 @@ audio_frame_metadata { samples_to_trim_at_end: 168 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24480 - num_subblocks: 1 constant_subblock_duration: 24480 subblocks: [ { diff --git a/tests/test_000023_f.mp4 b/tests/test_000023_f.mp4 index 0a549428..95ef2bef 100644 Binary files a/tests/test_000023_f.mp4 and b/tests/test_000023_f.mp4 differ diff --git a/tests/test_000023_s.mp4 b/tests/test_000023_s.mp4 index 89d953fe..3224b9c9 100644 Binary files a/tests/test_000023_s.mp4 and b/tests/test_000023_s.mp4 differ diff --git a/tests/test_000024.iamf b/tests/test_000024.iamf index 51eeebbe..60692a63 100644 Binary files a/tests/test_000024.iamf and b/tests/test_000024.iamf differ diff --git a/tests/test_000024.textproto b/tests/test_000024.textproto index 59f75e65..6bddf628 100644 --- a/tests/test_000024.textproto +++ b/tests/test_000024.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "3.11.1/num_samples_per_frame" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,11 +67,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -84,12 +85,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -115,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -138,15 +135,16 @@ audio_frame_metadata { samples_to_trim_at_end: 1608 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 25920 - num_subblocks: 1 constant_subblock_duration: 25920 subblocks: [ { diff --git a/tests/test_000024_f.mp4 b/tests/test_000024_f.mp4 index b557daf1..af352c89 100644 Binary files a/tests/test_000024_f.mp4 and b/tests/test_000024_f.mp4 differ diff --git a/tests/test_000024_s.mp4 b/tests/test_000024_s.mp4 index 30f0c381..979b9191 100644 Binary files a/tests/test_000024_s.mp4 and b/tests/test_000024_s.mp4 differ diff --git a/tests/test_000025.textproto b/tests/test_000025.textproto index d573764c..2798a132 100644 --- a/tests/test_000025.textproto +++ b/tests/test_000025.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -29,7 +29,11 @@ test_vector_metadata { "3.11.1/version" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -61,11 +65,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -82,12 +83,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -113,7 +111,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -136,15 +133,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000026.textproto b/tests/test_000026.textproto index d927cdff..a139f66c 100644 --- a/tests/test_000026.textproto +++ b/tests/test_000026.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,7 +32,11 @@ test_vector_metadata { "3.11.1/output_channel_count" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -65,11 +69,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -86,12 +87,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -117,7 +115,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -140,15 +137,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000027.textproto b/tests/test_000027.textproto index f26783bd..1b42f114 100644 --- a/tests/test_000027.textproto +++ b/tests/test_000027.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -29,7 +29,11 @@ test_vector_metadata { "3.11.1/output_gain" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -62,11 +66,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -83,12 +84,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -114,7 +112,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -137,15 +134,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000028.textproto b/tests/test_000028.textproto index ae88e313..9fffbe71 100644 --- a/tests/test_000028.textproto +++ b/tests/test_000028.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -29,7 +29,11 @@ test_vector_metadata { "3.11.1/channel_mapping_family" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -62,11 +66,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -83,12 +84,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -114,7 +112,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -137,15 +134,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000029.textproto b/tests/test_000029.textproto index 4c2bbed7..5ea929af 100644 --- a/tests/test_000029.textproto +++ b/tests/test_000029.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +125,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000029_f.mp4 b/tests/test_000029_f.mp4 index 9777a1bf..38732453 100644 Binary files a/tests/test_000029_f.mp4 and b/tests/test_000029_f.mp4 differ diff --git a/tests/test_000030.textproto b/tests/test_000030.textproto index 428e3dc6..b1c68205 100644 --- a/tests/test_000030.textproto +++ b/tests/test_000030.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000029" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +125,16 @@ audio_frame_metadata { samples_to_trim_at_end: 30 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 22080 - num_subblocks: 1 constant_subblock_duration: 22080 subblocks: [ { diff --git a/tests/test_000030_f.mp4 b/tests/test_000030_f.mp4 index ae65dd38..f356ab2f 100644 Binary files a/tests/test_000030_f.mp4 and b/tests/test_000030_f.mp4 differ diff --git a/tests/test_000031.textproto b/tests/test_000031.textproto index e0f6df40..83b1442c 100644 --- a/tests/test_000031.textproto +++ b/tests/test_000031.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -29,6 +29,11 @@ test_vector_metadata { base_test: "test_000029" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -53,11 +58,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -74,12 +76,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -105,7 +104,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -128,15 +126,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000031_f.mp4 b/tests/test_000031_f.mp4 index 9bdb5000..37f3afcf 100644 Binary files a/tests/test_000031_f.mp4 and b/tests/test_000031_f.mp4 differ diff --git a/tests/test_000031_s.mp4 b/tests/test_000031_s.mp4 index ff9af0ab..b7c8f0b3 100644 Binary files a/tests/test_000031_s.mp4 and b/tests/test_000031_s.mp4 differ diff --git a/tests/test_000032.iamf b/tests/test_000032.iamf index ef02a538..be8a985f 100644 Binary files a/tests/test_000032.iamf and b/tests/test_000032.iamf differ diff --git a/tests/test_000032.textproto b/tests/test_000032.textproto index e2970255..d7e96b50 100644 --- a/tests/test_000032.textproto +++ b/tests/test_000032.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "3.11.1/target_bitrate" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,11 +67,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -84,12 +85,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -115,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -138,15 +135,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000032_f.mp4 b/tests/test_000032_f.mp4 index 4298c5a0..e950a4cb 100644 Binary files a/tests/test_000032_f.mp4 and b/tests/test_000032_f.mp4 differ diff --git a/tests/test_000032_s.mp4 b/tests/test_000032_s.mp4 index d4b2afdd..03184337 100644 Binary files a/tests/test_000032_s.mp4 and b/tests/test_000032_s.mp4 differ diff --git a/tests/test_000033.iamf b/tests/test_000033.iamf index 43096860..cc2c6caa 100644 Binary files a/tests/test_000033.iamf and b/tests/test_000033.iamf differ diff --git a/tests/test_000033.textproto b/tests/test_000033.textproto index e0c80488..187b1849 100644 --- a/tests/test_000033.textproto +++ b/tests/test_000033.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,7 +30,11 @@ test_vector_metadata { "3.11.1/target_bitrate" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -62,11 +66,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -83,12 +84,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -114,7 +112,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -137,15 +134,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000033_f.mp4 b/tests/test_000033_f.mp4 index e630233f..439015fe 100644 Binary files a/tests/test_000033_f.mp4 and b/tests/test_000033_f.mp4 differ diff --git a/tests/test_000033_s.mp4 b/tests/test_000033_s.mp4 index 1b6a1cf9..28410bfc 100644 Binary files a/tests/test_000033_s.mp4 and b/tests/test_000033_s.mp4 differ diff --git a/tests/test_000034.iamf b/tests/test_000034.iamf index a7a83659..fb9888ed 100644 Binary files a/tests/test_000034.iamf and b/tests/test_000034.iamf differ diff --git a/tests/test_000034.textproto b/tests/test_000034.textproto index d5a1461b..ba49765e 100644 --- a/tests/test_000034.textproto +++ b/tests/test_000034.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,7 +30,11 @@ test_vector_metadata { "3.11.1/application" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -62,11 +66,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -83,12 +84,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -114,7 +112,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -137,15 +134,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000034_f.mp4 b/tests/test_000034_f.mp4 index 53bf6606..4ee5616d 100644 Binary files a/tests/test_000034_f.mp4 and b/tests/test_000034_f.mp4 differ diff --git a/tests/test_000034_s.mp4 b/tests/test_000034_s.mp4 index 7edb955f..7e5eb427 100644 Binary files a/tests/test_000034_s.mp4 and b/tests/test_000034_s.mp4 differ diff --git a/tests/test_000035.iamf b/tests/test_000035.iamf index 4517dc77..a48fe59e 100644 Binary files a/tests/test_000035.iamf and b/tests/test_000035.iamf differ diff --git a/tests/test_000035.textproto b/tests/test_000035.textproto index 3a1bbfed..d18c5c98 100644 --- a/tests/test_000035.textproto +++ b/tests/test_000035.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,7 +30,11 @@ test_vector_metadata { "3.11.1/application" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -62,11 +66,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -83,12 +84,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -114,7 +112,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -137,15 +134,16 @@ audio_frame_metadata { samples_to_trim_at_end: 840 samples_to_trim_at_start: 120 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000035_f.mp4 b/tests/test_000035_f.mp4 index e3494475..9c7efa98 100644 Binary files a/tests/test_000035_f.mp4 and b/tests/test_000035_f.mp4 differ diff --git a/tests/test_000035_s.mp4 b/tests/test_000035_s.mp4 index 11205f4d..44eadc02 100644 Binary files a/tests/test_000035_s.mp4 and b/tests/test_000035_s.mp4 differ diff --git a/tests/test_000036.iamf b/tests/test_000036.iamf index 38ce6349..0270aed7 100644 Binary files a/tests/test_000036.iamf and b/tests/test_000036.iamf differ diff --git a/tests/test_000036.textproto b/tests/test_000036.textproto index 5e71a096..6cfaec86 100644 --- a/tests/test_000036.textproto +++ b/tests/test_000036.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,9 +65,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 1 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -72,7 +75,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 512 - num_subblocks: 1 constant_subblock_duration: 512 } default_demixing_info_parameter_data: { @@ -82,7 +84,6 @@ audio_element_metadata { } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -107,12 +108,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -138,7 +136,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -175,15 +172,20 @@ audio_frame_metadata { samples_to_trim_at_end: 128 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 645120 - num_subblocks: 1 constant_subblock_duration: 645120 subblocks: [ { diff --git a/tests/test_000036_f.mp4 b/tests/test_000036_f.mp4 index 40bd3b69..87dbbcfb 100644 Binary files a/tests/test_000036_f.mp4 and b/tests/test_000036_f.mp4 differ diff --git a/tests/test_000036_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000036_rendered_id_42_sub_mix_0_layout_0.wav index b13b1d2c..d678bf80 100644 Binary files a/tests/test_000036_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000036_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000036_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000036_rendered_id_42_sub_mix_0_layout_1.wav index 88314284..fa243d06 100644 Binary files a/tests/test_000036_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000036_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000036_s.mp4 b/tests/test_000036_s.mp4 index aaa1de08..2440b3df 100644 Binary files a/tests/test_000036_s.mp4 and b/tests/test_000036_s.mp4 differ diff --git a/tests/test_000037.iamf b/tests/test_000037.iamf index 5f40678b..e100bc19 100644 Binary files a/tests/test_000037.iamf and b/tests/test_000037.iamf differ diff --git a/tests/test_000037.textproto b/tests/test_000037.textproto index 971e81e6..43fd6eed 100644 --- a/tests/test_000037.textproto +++ b/tests/test_000037.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -26,7 +26,11 @@ test_vector_metadata { ] primary_tested_spec_sections: ["6/ISOBMFF IAMF Encapsulation"] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -58,9 +62,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 1 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -70,7 +72,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -80,7 +81,6 @@ audio_element_metadata { } } scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -97,12 +97,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -128,7 +125,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -152,15 +148,16 @@ audio_frame_metadata { samples_to_trim_at_end: 264 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 1093440 - num_subblocks: 1 constant_subblock_duration: 1093440 subblocks: [ { diff --git a/tests/test_000037_f.mp4 b/tests/test_000037_f.mp4 index 5f86c883..f2c98a1b 100644 Binary files a/tests/test_000037_f.mp4 and b/tests/test_000037_f.mp4 differ diff --git a/tests/test_000037_s.mp4 b/tests/test_000037_s.mp4 index 9d2414fb..ee950aba 100644 Binary files a/tests/test_000037_s.mp4 and b/tests/test_000037_s.mp4 differ diff --git a/tests/test_000038.iamf b/tests/test_000038.iamf index 0761e26c..e76cf7d1 100644 Binary files a/tests/test_000038.iamf and b/tests/test_000038.iamf differ diff --git a/tests/test_000038.textproto b/tests/test_000038.textproto index 11b9ada5..5e6b0905 100644 --- a/tests/test_000038.textproto +++ b/tests/test_000038.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,9 +65,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -75,12 +78,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +106,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -118,7 +117,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -5209 - digital_peak: -4109 + digital_peak: -4110 } } } @@ -129,15 +128,18 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000038_f.mp4 b/tests/test_000038_f.mp4 index 845fb176..daf1aa77 100644 Binary files a/tests/test_000038_f.mp4 and b/tests/test_000038_f.mp4 differ diff --git a/tests/test_000038_s.mp4 b/tests/test_000038_s.mp4 index 49e60be3..08fb0440 100644 Binary files a/tests/test_000038_s.mp4 and b/tests/test_000038_s.mp4 differ diff --git a/tests/test_000039.textproto b/tests/test_000039.textproto index 422e1981..f560f4e7 100644 --- a/tests/test_000039.textproto +++ b/tests/test_000039.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,6 +34,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -58,9 +63,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -73,12 +76,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +104,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,15 +126,30 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000039_f.mp4 b/tests/test_000039_f.mp4 index 323e5225..301861b6 100644 Binary files a/tests/test_000039_f.mp4 and b/tests/test_000039_f.mp4 differ diff --git a/tests/test_000040.textproto b/tests/test_000040.textproto index f3c0b295..9c56b1ee 100644 --- a/tests/test_000040.textproto +++ b/tests/test_000040.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -29,6 +29,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -53,9 +58,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 3 audio_substream_ids: [0, 1, 2] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -68,12 +71,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -99,7 +99,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -122,15 +121,17 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2] - channel_labels: ["A0", "A1", "A2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000042.textproto b/tests/test_000042.textproto index 574c29b9..422da546 100644 --- a/tests/test_000042.textproto +++ b/tests/test_000042.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -36,6 +35,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,33 +64,30 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 4 substream_count: 4 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, # col 0 0, 32767, 0, 0, # col 1 0, 0, 32767, 0, # col 2 0, 0, 0, 32767 # col 3 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -112,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -135,15 +135,18 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000042_f.mp4 b/tests/test_000042_f.mp4 index c4e8b0d3..533a7bca 100644 Binary files a/tests/test_000042_f.mp4 and b/tests/test_000042_f.mp4 differ diff --git a/tests/test_000043.iamf b/tests/test_000043.iamf index f3516dea..f52a72af 100644 Binary files a/tests/test_000043.iamf and b/tests/test_000043.iamf differ diff --git a/tests/test_000043.textproto b/tests/test_000043.textproto index d57434b4..021a9456 100644 --- a/tests/test_000043.textproto +++ b/tests/test_000043.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -36,6 +35,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,15 +64,14 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 16 substream_count: 16 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 0 0, 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 1 @@ -87,18 +90,16 @@ audio_element_metadata { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32767, 0, # col 14 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32767 # col 15 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -124,7 +125,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -136,7 +136,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -5807 - digital_peak: -4704 + digital_peak: -4705 } } } @@ -147,15 +147,30 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000043_f.mp4 b/tests/test_000043_f.mp4 index 9b072d3e..71757181 100644 Binary files a/tests/test_000043_f.mp4 and b/tests/test_000043_f.mp4 differ diff --git a/tests/test_000043_s.mp4 b/tests/test_000043_s.mp4 index 4021f6ea..8e4f323a 100644 Binary files a/tests/test_000043_s.mp4 and b/tests/test_000043_s.mp4 differ diff --git a/tests/test_000044.iamf b/tests/test_000044.iamf index 2a751c5e..f3894977 100644 Binary files a/tests/test_000044.iamf and b/tests/test_000044.iamf differ diff --git a/tests/test_000044.textproto b/tests/test_000044.textproto index 36dba15b..a880729b 100644 --- a/tests/test_000044.textproto +++ b/tests/test_000044.textproto @@ -8,16 +8,15 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: - "An IAMF stream encoded using `ambisonics_mode` = `PROJECTION`. This " - "test vector tests mixed-order ambisonics representation by using " - "third-order ambisonics to represent a lower order (first-order) " - "ambisonics by using a demixing matrix." + "An IAMF stream encoded using `ambisonics_mode` = `PROJECTION`. This " + "test vector tests mixed-order ambisonics representation by using " + "third-order ambisonics to represent a lower order (first-order) " + "ambisonics by using a demixing matrix." file_name_prefix: "test_000044" is_valid: true is_valid_to_decode: true @@ -28,15 +27,20 @@ test_vector_metadata { "github/aomediacodec/libiamf/v1.0.0-errata" ] primary_tested_spec_sections: [ - "3.6.3/ambisonics_projection_config", - "7/IAMF Processing", - "7.1/demixing_matrix", - "7.3.2/Rendering an Audio Element", - "7.3.2.2/Rendering a Scene-Based Audio Element to Loudspeakers" + "3.6.3/ambisonics_projection_config", + "7/IAMF Processing", + "7.1/demixing_matrix", + "7.3.2/Rendering an Audio Element", + "7.3.2.2/Rendering a Scene-Based Audio Element to Loudspeakers" ] base_test: "test_000043" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -61,33 +65,30 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 16 substream_count: 4 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 0 0, 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 1 0, 0, 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 2 0, 0, 0, 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 # col 3 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -113,7 +114,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -125,7 +125,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -5257 - digital_peak: -4157 + digital_peak: -4158 } } } @@ -136,15 +136,18 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000044_f.mp4 b/tests/test_000044_f.mp4 index a646674c..b1ea95b0 100644 Binary files a/tests/test_000044_f.mp4 and b/tests/test_000044_f.mp4 differ diff --git a/tests/test_000044_s.mp4 b/tests/test_000044_s.mp4 index f2d6ffb4..3c893cc0 100644 Binary files a/tests/test_000044_s.mp4 and b/tests/test_000044_s.mp4 differ diff --git a/tests/test_000045.iamf b/tests/test_000045.iamf index 0502a8fd..9733c301 100644 Binary files a/tests/test_000045.iamf and b/tests/test_000045.iamf differ diff --git a/tests/test_000045.textproto b/tests/test_000045.textproto index 74e4b65a..36573d07 100644 --- a/tests/test_000045.textproto +++ b/tests/test_000045.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,7 +30,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000038" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -62,9 +66,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -77,12 +79,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -108,7 +107,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -131,15 +129,18 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000045_f.mp4 b/tests/test_000045_f.mp4 index a6431833..115e8a06 100644 Binary files a/tests/test_000045_f.mp4 and b/tests/test_000045_f.mp4 differ diff --git a/tests/test_000045_s.mp4 b/tests/test_000045_s.mp4 index 5f01b63f..8c3f5e46 100644 Binary files a/tests/test_000045_s.mp4 and b/tests/test_000045_s.mp4 differ diff --git a/tests/test_000046.iamf b/tests/test_000046.iamf index 45fc8d95..3cf95ace 100644 Binary files a/tests/test_000046.iamf and b/tests/test_000046.iamf differ diff --git a/tests/test_000046.textproto b/tests/test_000046.textproto index b3ec1d83..34c70830 100644 --- a/tests/test_000046.textproto +++ b/tests/test_000046.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,7 +30,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000043" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -62,9 +66,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -77,12 +79,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -108,7 +107,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -131,15 +129,30 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000046_f.mp4 b/tests/test_000046_f.mp4 index ed79dcea..a0e4f8b7 100644 Binary files a/tests/test_000046_f.mp4 and b/tests/test_000046_f.mp4 differ diff --git a/tests/test_000046_s.mp4 b/tests/test_000046_s.mp4 index 60863d4c..b9b6dcdb 100644 Binary files a/tests/test_000046_s.mp4 and b/tests/test_000046_s.mp4 differ diff --git a/tests/test_000048.iamf b/tests/test_000048.iamf index 8c5e3042..c382ecec 100644 Binary files a/tests/test_000048.iamf and b/tests/test_000048.iamf differ diff --git a/tests/test_000048.textproto b/tests/test_000048.textproto index fbd9632d..ce1ede70 100644 --- a/tests/test_000048.textproto +++ b/tests/test_000048.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -32,7 +31,11 @@ test_vector_metadata { "7.3.2.2/Rendering a Scene-Based Audio Element to Loudspeakers" ] base_test: "test_000042" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -64,33 +67,30 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 2 audio_substream_ids: [0, 1] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 4 substream_count: 2 coupled_substream_count: 2 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, # col 0 0, 32767, 0, 0, # col 1 0, 0, 32767, 0, # col 2 0, 0, 0, 32767 # col 3 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -116,7 +116,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -139,15 +138,18 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000048_f.mp4 b/tests/test_000048_f.mp4 index 3fc17871..8eaa55e3 100644 Binary files a/tests/test_000048_f.mp4 and b/tests/test_000048_f.mp4 differ diff --git a/tests/test_000048_s.mp4 b/tests/test_000048_s.mp4 index 470d48a6..a0726625 100644 Binary files a/tests/test_000048_s.mp4 and b/tests/test_000048_s.mp4 differ diff --git a/tests/test_000049.iamf b/tests/test_000049.iamf index 1d582220..f7bed515 100644 Binary files a/tests/test_000049.iamf and b/tests/test_000049.iamf differ diff --git a/tests/test_000049.textproto b/tests/test_000049.textproto index d93ae7be..a74e9d3f 100644 --- a/tests/test_000049.textproto +++ b/tests/test_000049.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,7 +34,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000036" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -66,9 +70,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -78,7 +80,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 2880 - num_subblocks: 1 constant_subblock_duration: 2880 } default_demixing_info_parameter_data: { @@ -96,13 +97,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 2880 - num_subblocks: 1 constant_subblock_duration: 2880 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -127,12 +126,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -158,7 +154,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -195,15 +190,20 @@ audio_frame_metadata { samples_to_trim_at_end: 1608 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 648000 - num_subblocks: 1 constant_subblock_duration: 648000 subblocks: [ { diff --git a/tests/test_000049_f.mp4 b/tests/test_000049_f.mp4 index 7724727e..9b5ea60f 100644 Binary files a/tests/test_000049_f.mp4 and b/tests/test_000049_f.mp4 differ diff --git a/tests/test_000049_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000049_rendered_id_42_sub_mix_0_layout_0.wav index b13b1d2c..d678bf80 100644 Binary files a/tests/test_000049_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000049_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000049_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000049_rendered_id_42_sub_mix_0_layout_1.wav index 88314284..fa243d06 100644 Binary files a/tests/test_000049_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000049_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000049_s.mp4 b/tests/test_000049_s.mp4 index c7013cc8..c747b969 100644 Binary files a/tests/test_000049_s.mp4 and b/tests/test_000049_s.mp4 differ diff --git a/tests/test_000050.iamf b/tests/test_000050.iamf index de9e9b4c..35c7eaba 100644 Binary files a/tests/test_000050.iamf and b/tests/test_000050.iamf differ diff --git a/tests/test_000050.textproto b/tests/test_000050.textproto index 94baefa6..1c2ef30e 100644 --- a/tests/test_000050.textproto +++ b/tests/test_000050.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -41,7 +41,11 @@ test_vector_metadata { "7.3.2.1/Rendering a Channel-Based Audio Element to Loudspeakers" ] base_test: "test_000037" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -73,9 +77,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 7 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -85,7 +87,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -103,13 +104,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 4 reserved: 0 channel_audio_layer_configs: [ { @@ -150,12 +149,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -181,7 +177,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 4 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -206,7 +201,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6276 + integrated_loudness: -6424 digital_peak: -2687 } } @@ -220,7 +215,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -7098 + integrated_loudness: -6436 digital_peak: -2816 } } @@ -234,7 +229,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -7098 + integrated_loudness: -6529 digital_peak: -2816 } } @@ -246,15 +241,26 @@ audio_frame_metadata { samples_to_trim_at_end: 264 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 1093440 - num_subblocks: 1 constant_subblock_duration: 1093440 subblocks: [ { diff --git a/tests/test_000050_f.mp4 b/tests/test_000050_f.mp4 index 581d4435..fcb50466 100644 Binary files a/tests/test_000050_f.mp4 and b/tests/test_000050_f.mp4 differ diff --git a/tests/test_000050_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000050_rendered_id_42_sub_mix_0_layout_0.wav index 40101559..363a8e3c 100644 Binary files a/tests/test_000050_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000050_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000050_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000050_rendered_id_42_sub_mix_0_layout_1.wav index 268f528d..446caa8c 100644 Binary files a/tests/test_000050_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000050_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000050_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000050_rendered_id_42_sub_mix_0_layout_2.wav index bdd56c03..af4ff7b6 100644 Binary files a/tests/test_000050_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000050_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000050_rendered_id_42_sub_mix_0_layout_3.wav b/tests/test_000050_rendered_id_42_sub_mix_0_layout_3.wav index cd9f3de6..68a57293 100644 Binary files a/tests/test_000050_rendered_id_42_sub_mix_0_layout_3.wav and b/tests/test_000050_rendered_id_42_sub_mix_0_layout_3.wav differ diff --git a/tests/test_000050_s.mp4 b/tests/test_000050_s.mp4 index 803205d6..f1ad61c2 100644 Binary files a/tests/test_000050_s.mp4 and b/tests/test_000050_s.mp4 differ diff --git a/tests/test_000051.iamf b/tests/test_000051.iamf index 44f29d3a..01316971 100644 Binary files a/tests/test_000051.iamf and b/tests/test_000051.iamf differ diff --git a/tests/test_000051.textproto b/tests/test_000051.textproto index f098f6c1..a22fc168 100644 --- a/tests/test_000051.textproto +++ b/tests/test_000051.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,7 +34,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000050" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -66,9 +70,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 6 audio_substream_ids: [0, 1, 2, 3, 4, 5] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -78,7 +80,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -96,13 +97,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 3 reserved: 0 channel_audio_layer_configs: [ { @@ -135,12 +134,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -166,7 +162,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 3 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -191,7 +186,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6197 + integrated_loudness: -6297 digital_peak: -2687 } } @@ -205,7 +200,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6308 digital_peak: -2816 } } @@ -218,15 +213,25 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf2", "Rtf2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_2 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_2 } + ] + } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 240960 - num_subblocks: 1 constant_subblock_duration: 240960 subblocks: [ { diff --git a/tests/test_000051_f.mp4 b/tests/test_000051_f.mp4 index 0cbc80d7..8d51143d 100644 Binary files a/tests/test_000051_f.mp4 and b/tests/test_000051_f.mp4 differ diff --git a/tests/test_000051_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000051_rendered_id_42_sub_mix_0_layout_0.wav index 48d3767a..94ecf56b 100644 Binary files a/tests/test_000051_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000051_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000051_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000051_rendered_id_42_sub_mix_0_layout_1.wav index d59ddce9..dc028fd2 100644 Binary files a/tests/test_000051_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000051_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000051_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000051_rendered_id_42_sub_mix_0_layout_2.wav index efc8b06b..bdbd829e 100644 Binary files a/tests/test_000051_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000051_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000051_s.mp4 b/tests/test_000051_s.mp4 index 0fd61761..c60b715f 100644 Binary files a/tests/test_000051_s.mp4 and b/tests/test_000051_s.mp4 differ diff --git a/tests/test_000052.iamf b/tests/test_000052.iamf index da7c14d4..a6e06a92 100644 Binary files a/tests/test_000052.iamf and b/tests/test_000052.iamf differ diff --git a/tests/test_000052.textproto b/tests/test_000052.textproto index 742230d3..a50cebea 100644 --- a/tests/test_000052.textproto +++ b/tests/test_000052.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -37,7 +37,11 @@ test_vector_metadata { "7.3.2.1/Rendering a Channel-Based Audio Element to Loudspeakers" ] base_test: "test_000051" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -69,9 +73,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -81,7 +83,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -99,13 +100,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -130,12 +129,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -161,7 +157,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -186,7 +181,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6809 + integrated_loudness: -6988 digital_peak: -2816 } } @@ -199,15 +194,20 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 8, 9] - channel_labels: ["L3", "R3", "C", "LFE", "Ltf3", "Rtf3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_3 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_3 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_3 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 240960 - num_subblocks: 1 constant_subblock_duration: 240960 subblocks: [ { diff --git a/tests/test_000052_f.mp4 b/tests/test_000052_f.mp4 index 88751435..6d9390be 100644 Binary files a/tests/test_000052_f.mp4 and b/tests/test_000052_f.mp4 differ diff --git a/tests/test_000052_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000052_rendered_id_42_sub_mix_0_layout_1.wav index bdfc80be..12ce3ec9 100644 Binary files a/tests/test_000052_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000052_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000052_s.mp4 b/tests/test_000052_s.mp4 index 3a0197a9..3acdd209 100644 Binary files a/tests/test_000052_s.mp4 and b/tests/test_000052_s.mp4 differ diff --git a/tests/test_000053.iamf b/tests/test_000053.iamf index 5443f9b0..6ba74f74 100644 Binary files a/tests/test_000053.iamf and b/tests/test_000053.iamf differ diff --git a/tests/test_000053.textproto b/tests/test_000053.textproto index e2aaab5c..0b860a77 100644 --- a/tests/test_000053.textproto +++ b/tests/test_000053.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,7 +34,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000051" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -66,9 +70,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 5 audio_substream_ids: [0, 1, 2, 3, 4] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -78,7 +80,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -96,13 +97,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -127,12 +126,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -158,7 +154,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -183,7 +178,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6600 digital_peak: -2816 } } @@ -196,15 +191,23 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 } + ] + } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 240960 - num_subblocks: 1 constant_subblock_duration: 240960 subblocks: [ { diff --git a/tests/test_000053_f.mp4 b/tests/test_000053_f.mp4 index 2b6f3ee9..e4241c70 100644 Binary files a/tests/test_000053_f.mp4 and b/tests/test_000053_f.mp4 differ diff --git a/tests/test_000053_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000053_rendered_id_42_sub_mix_0_layout_0.wav index 48d3767a..94ecf56b 100644 Binary files a/tests/test_000053_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000053_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000053_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000053_rendered_id_42_sub_mix_0_layout_1.wav index 9fa5d559..d11c6685 100644 Binary files a/tests/test_000053_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000053_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000053_s.mp4 b/tests/test_000053_s.mp4 index 540100b2..77141c51 100644 Binary files a/tests/test_000053_s.mp4 and b/tests/test_000053_s.mp4 differ diff --git a/tests/test_000054.iamf b/tests/test_000054.iamf index 445b80dc..e4e29d8d 100644 Binary files a/tests/test_000054.iamf and b/tests/test_000054.iamf differ diff --git a/tests/test_000054.textproto b/tests/test_000054.textproto index 8fc735c4..a179ae32 100644 --- a/tests/test_000054.textproto +++ b/tests/test_000054.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,7 +36,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000050" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -68,9 +72,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 6 audio_substream_ids: [0, 1, 2, 3, 4, 5] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -80,7 +82,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -98,13 +99,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 4 reserved: 0 channel_audio_layer_configs: [ { @@ -145,12 +144,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -176,7 +172,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 4 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -215,7 +210,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6205 digital_peak: -2816 } } @@ -229,7 +224,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6312 digital_peak: -2816 } } @@ -241,15 +236,24 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 8, 9, 10, 11] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 240960 - num_subblocks: 1 constant_subblock_duration: 240960 subblocks: [ { diff --git a/tests/test_000054_f.mp4 b/tests/test_000054_f.mp4 index 750eafcc..f01eb8d8 100644 Binary files a/tests/test_000054_f.mp4 and b/tests/test_000054_f.mp4 differ diff --git a/tests/test_000054_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000054_rendered_id_42_sub_mix_0_layout_0.wav index ed04493b..fbdda93d 100644 Binary files a/tests/test_000054_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000054_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000054_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000054_rendered_id_42_sub_mix_0_layout_1.wav index dbb1401b..8f09053b 100644 Binary files a/tests/test_000054_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000054_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000054_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000054_rendered_id_42_sub_mix_0_layout_2.wav index 41952eb4..646b79ac 100644 Binary files a/tests/test_000054_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000054_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000054_rendered_id_42_sub_mix_0_layout_3.wav b/tests/test_000054_rendered_id_42_sub_mix_0_layout_3.wav index 3b10e828..7ccc2616 100644 Binary files a/tests/test_000054_rendered_id_42_sub_mix_0_layout_3.wav and b/tests/test_000054_rendered_id_42_sub_mix_0_layout_3.wav differ diff --git a/tests/test_000054_s.mp4 b/tests/test_000054_s.mp4 index 20e82ae7..47f2c3d6 100644 Binary files a/tests/test_000054_s.mp4 and b/tests/test_000054_s.mp4 differ diff --git a/tests/test_000055.iamf b/tests/test_000055.iamf index eb3553cf..b7037205 100644 Binary files a/tests/test_000055.iamf and b/tests/test_000055.iamf differ diff --git a/tests/test_000055.textproto b/tests/test_000055.textproto index e4106a18..c39f5c67 100644 --- a/tests/test_000055.textproto +++ b/tests/test_000055.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000054" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,9 +67,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 5 audio_substream_ids: [0, 1, 2, 3, 4] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -75,7 +77,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -93,13 +94,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 3 reserved: 0 channel_audio_layer_configs: [ { @@ -132,12 +131,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -163,7 +159,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 3 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -202,7 +197,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6445 digital_peak: -2816 } } @@ -215,15 +210,22 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 8, 9] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5", "Ltf2", "Rtf2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_2 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 240960 - num_subblocks: 1 constant_subblock_duration: 240960 subblocks: [ { diff --git a/tests/test_000055_f.mp4 b/tests/test_000055_f.mp4 index f85e0b35..49b8ebdd 100644 Binary files a/tests/test_000055_f.mp4 and b/tests/test_000055_f.mp4 differ diff --git a/tests/test_000055_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000055_rendered_id_42_sub_mix_0_layout_0.wav index ed04493b..fbdda93d 100644 Binary files a/tests/test_000055_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000055_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000055_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000055_rendered_id_42_sub_mix_0_layout_1.wav index dbb1401b..8f09053b 100644 Binary files a/tests/test_000055_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000055_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000055_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000055_rendered_id_42_sub_mix_0_layout_2.wav index 3bf3b33c..1d73db96 100644 Binary files a/tests/test_000055_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000055_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000055_s.mp4 b/tests/test_000055_s.mp4 index ec2911ca..6e8705b2 100644 Binary files a/tests/test_000055_s.mp4 and b/tests/test_000055_s.mp4 differ diff --git a/tests/test_000056.iamf b/tests/test_000056.iamf index 6ff7957d..67a5b35c 100644 Binary files a/tests/test_000056.iamf and b/tests/test_000056.iamf differ diff --git a/tests/test_000056.textproto b/tests/test_000056.textproto index d39ec27e..5b3458e7 100644 --- a/tests/test_000056.textproto +++ b/tests/test_000056.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000055" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,9 +67,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -75,7 +77,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -93,13 +94,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -124,12 +123,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -155,7 +151,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -193,15 +188,20 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 240960 - num_subblocks: 1 constant_subblock_duration: 240960 subblocks: [ { diff --git a/tests/test_000056_f.mp4 b/tests/test_000056_f.mp4 index e792756b..b7c88ed8 100644 Binary files a/tests/test_000056_f.mp4 and b/tests/test_000056_f.mp4 differ diff --git a/tests/test_000056_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000056_rendered_id_42_sub_mix_0_layout_0.wav index ed04493b..fbdda93d 100644 Binary files a/tests/test_000056_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000056_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000056_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000056_rendered_id_42_sub_mix_0_layout_1.wav index dbb1401b..8f09053b 100644 Binary files a/tests/test_000056_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000056_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000056_s.mp4 b/tests/test_000056_s.mp4 index c50296ae..1368de91 100644 Binary files a/tests/test_000056_s.mp4 and b/tests/test_000056_s.mp4 differ diff --git a/tests/test_000058.textproto b/tests/test_000058.textproto index 48427b81..2abb5088 100644 --- a/tests/test_000058.textproto +++ b/tests/test_000058.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -33,6 +33,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_BASE additional_profile: PROFILE_VERSION_BASE @@ -57,11 +62,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -81,11 +83,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [1] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -102,12 +101,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 2 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -149,7 +145,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -172,8 +167,10 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } audio_frame_metadata { @@ -181,15 +178,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 301 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000058_f.mp4 b/tests/test_000058_f.mp4 index a88a7e21..849538c5 100644 Binary files a/tests/test_000058_f.mp4 and b/tests/test_000058_f.mp4 differ diff --git a/tests/test_000059.iamf b/tests/test_000059.iamf index c7543590..f27c6c78 100644 Binary files a/tests/test_000059.iamf and b/tests/test_000059.iamf differ diff --git a/tests/test_000059.textproto b/tests/test_000059.textproto index d9afca1b..08d1d6e0 100644 --- a/tests/test_000059.textproto +++ b/tests/test_000059.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -35,7 +35,11 @@ test_vector_metadata { "7.3.2.1/Rendering a Channel-Based Audio Element to Loudspeakers" ] base_test: "test_000056" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -67,9 +71,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -79,7 +81,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -97,13 +98,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -128,12 +127,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -159,7 +155,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -197,15 +192,20 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { @@ -225,7 +225,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -258,7 +257,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 960 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -291,7 +289,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 1920 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -324,7 +321,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 2880 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -357,7 +353,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 3840 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -390,7 +385,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 4800 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -423,7 +417,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 5760 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -456,7 +449,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 6720 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -489,7 +481,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 7680 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -522,7 +513,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 8640 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -555,7 +545,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 9600 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -588,7 +577,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 10560 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -621,7 +609,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 11520 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -654,7 +641,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 12480 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -687,7 +673,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 13440 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -720,7 +705,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 14400 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -753,7 +737,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 15360 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -786,7 +769,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 16320 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -819,7 +801,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 17280 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -852,7 +833,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 18240 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -885,7 +865,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 19200 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -918,7 +897,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 20160 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -951,7 +929,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 21120 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -984,7 +961,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 22080 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -1017,7 +993,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 23040 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -1050,7 +1025,6 @@ parameter_block_metadata { parameter_id: 101 start_timestamp: 24000 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { diff --git a/tests/test_000059_f.mp4 b/tests/test_000059_f.mp4 index a34e1564..e125566f 100644 Binary files a/tests/test_000059_f.mp4 and b/tests/test_000059_f.mp4 differ diff --git a/tests/test_000059_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000059_rendered_id_42_sub_mix_0_layout_0.wav index 9c4aaac7..4afecbbf 100644 Binary files a/tests/test_000059_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000059_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000059_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000059_rendered_id_42_sub_mix_0_layout_1.wav index a03b696b..0efd690d 100644 Binary files a/tests/test_000059_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000059_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000059_s.mp4 b/tests/test_000059_s.mp4 index abb12ca8..93e121a3 100644 Binary files a/tests/test_000059_s.mp4 and b/tests/test_000059_s.mp4 differ diff --git a/tests/test_000060.textproto b/tests/test_000060.textproto index 3692038d..1bf8b791 100644 --- a/tests/test_000060.textproto +++ b/tests/test_000060.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -56,11 +61,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -77,15 +79,12 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 2 annotations_language: ["en-us", "es-mx"] localized_presentation_annotations: [ "test_mix_pres", "prueba_mezcla_presentación" ] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: [ @@ -114,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -137,15 +135,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000060_f.mp4 b/tests/test_000060_f.mp4 index 385a4e13..59f0850a 100644 Binary files a/tests/test_000060_f.mp4 and b/tests/test_000060_f.mp4 differ diff --git a/tests/test_000061.iamf b/tests/test_000061.iamf index 13729b44..91c8ed4d 100644 Binary files a/tests/test_000061.iamf and b/tests/test_000061.iamf differ diff --git a/tests/test_000061.textproto b/tests/test_000061.textproto index 89e04beb..d1bc8ae3 100644 --- a/tests/test_000061.textproto +++ b/tests/test_000061.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -37,7 +37,11 @@ test_vector_metadata { "7.3.2.1/Rendering a Channel-Based Audio Element to Loudspeakers" ] base_test: "test_000056" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -69,9 +73,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -81,7 +83,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -99,13 +100,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -130,12 +129,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -161,7 +157,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -199,15 +194,20 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { @@ -227,7 +227,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -242,7 +241,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 960 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -257,7 +255,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 1920 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -272,7 +269,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 2880 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -287,7 +283,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 3840 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -302,7 +297,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 4800 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -317,7 +311,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 5760 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -332,7 +325,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 6720 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -347,7 +339,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 7680 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -362,7 +353,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 8640 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -377,7 +367,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 9600 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -392,7 +381,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 10560 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -407,7 +395,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 11520 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -422,7 +409,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 12480 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -437,7 +423,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 13440 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -452,7 +437,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 14400 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -467,7 +451,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 15360 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -482,7 +465,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 16320 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -497,7 +479,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 17280 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -512,7 +493,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 18240 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -527,7 +507,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 19200 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -542,7 +521,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 20160 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -557,7 +535,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 21120 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -572,7 +549,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 22080 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -587,7 +563,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 23040 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { @@ -602,7 +577,6 @@ parameter_block_metadata { parameter_id: 102 start_timestamp: 24000 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 subblocks: [ { diff --git a/tests/test_000061_f.mp4 b/tests/test_000061_f.mp4 index 0f083873..91757de3 100644 Binary files a/tests/test_000061_f.mp4 and b/tests/test_000061_f.mp4 differ diff --git a/tests/test_000061_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000061_rendered_id_42_sub_mix_0_layout_0.wav index 9c4aaac7..4afecbbf 100644 Binary files a/tests/test_000061_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000061_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000061_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000061_rendered_id_42_sub_mix_0_layout_1.wav index a03b696b..0efd690d 100644 Binary files a/tests/test_000061_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000061_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000061_s.mp4 b/tests/test_000061_s.mp4 index 6c4a480b..6e6e87b7 100644 Binary files a/tests/test_000061_s.mp4 and b/tests/test_000061_s.mp4 differ diff --git a/tests/test_000062.textproto b/tests/test_000062.textproto index e45a4284..fbe26c5e 100644 --- a/tests/test_000062.textproto +++ b/tests/test_000062.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -33,6 +33,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -57,11 +62,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -78,12 +80,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -109,7 +108,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -123,7 +121,6 @@ mix_presentation_metadata { integrated_loudness: -13733 digital_peak: -12879 anchored_loudness { - num_anchored_loudness: 2 anchor_elements: [ { anchor_element: ANCHOR_TYPE_DIALOGUE anchored_loudness: 1000 }, { anchor_element: ANCHOR_TYPE_ALBUM anchored_loudness: 1001 } @@ -139,15 +136,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000062_f.mp4 b/tests/test_000062_f.mp4 index 055fd015..dc392889 100644 Binary files a/tests/test_000062_f.mp4 and b/tests/test_000062_f.mp4 differ diff --git a/tests/test_000063.textproto b/tests/test_000063.textproto index 1e9692e0..a1073fd9 100644 --- a/tests/test_000063.textproto +++ b/tests/test_000063.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -33,6 +33,11 @@ test_vector_metadata { base_test: "test_000062" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -57,11 +62,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -78,12 +80,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -109,7 +108,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -123,7 +121,6 @@ mix_presentation_metadata { integrated_loudness: -13733 digital_peak: -12879 anchored_loudness { - num_anchored_loudness: 2 anchor_elements: [ { anchor_element: ANCHOR_TYPE_DIALOGUE anchored_loudness: 1000 }, { anchor_element: ANCHOR_TYPE_DIALOGUE anchored_loudness: 1001 } @@ -139,15 +136,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000064.textproto b/tests/test_000064.textproto index 9e215308..d5eda25d 100644 --- a/tests/test_000064.textproto +++ b/tests/test_000064.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000003" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,8 +125,10 @@ audio_frame_metadata { samples_to_trim_at_end: 64 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000064_f.mp4 b/tests/test_000064_f.mp4 index 4decd039..68bac09f 100644 Binary files a/tests/test_000064_f.mp4 and b/tests/test_000064_f.mp4 differ diff --git a/tests/test_000065.iamf b/tests/test_000065.iamf index 7af98ad3..b9253190 100644 Binary files a/tests/test_000065.iamf and b/tests/test_000065.iamf differ diff --git a/tests/test_000065.textproto b/tests/test_000065.textproto index f95349e9..23b83faa 100644 --- a/tests/test_000065.textproto +++ b/tests/test_000065.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -33,6 +33,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -57,9 +62,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -72,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -103,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -115,7 +114,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -4809 - digital_peak: -3347 + digital_peak: -3346 } } } @@ -126,15 +125,18 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000065_f.mp4 b/tests/test_000065_f.mp4 index 976ab3b7..c80c50b9 100644 Binary files a/tests/test_000065_f.mp4 and b/tests/test_000065_f.mp4 differ diff --git a/tests/test_000065_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000065_rendered_id_42_sub_mix_0_layout_0.wav index 3e7f871b..cd262b12 100644 Binary files a/tests/test_000065_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000065_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000065_s.mp4 b/tests/test_000065_s.mp4 index 4415c316..5a44219e 100644 Binary files a/tests/test_000065_s.mp4 and b/tests/test_000065_s.mp4 differ diff --git a/tests/test_000066.iamf b/tests/test_000066.iamf index 5d7b5bf1..6277a3b1 100644 Binary files a/tests/test_000066.iamf and b/tests/test_000066.iamf differ diff --git a/tests/test_000066.textproto b/tests/test_000066.textproto index c377d0b7..5df06c75 100644 --- a/tests/test_000066.textproto +++ b/tests/test_000066.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -39,6 +39,11 @@ test_vector_metadata { base_test: "test_000065" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -63,9 +68,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -78,12 +81,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -109,7 +109,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -120,7 +119,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4441 + integrated_loudness: -4442 digital_peak: -3342 } } @@ -132,15 +131,18 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 2 constant_subblock_duration: 0 subblocks: [ { diff --git a/tests/test_000066_f.mp4 b/tests/test_000066_f.mp4 index c15d8eb2..745995f3 100644 Binary files a/tests/test_000066_f.mp4 and b/tests/test_000066_f.mp4 differ diff --git a/tests/test_000066_s.mp4 b/tests/test_000066_s.mp4 index eab21acf..1a07ad6d 100644 Binary files a/tests/test_000066_s.mp4 and b/tests/test_000066_s.mp4 differ diff --git a/tests/test_000067.iamf b/tests/test_000067.iamf index f0cdb342..75c9fda8 100644 Binary files a/tests/test_000067.iamf and b/tests/test_000067.iamf differ diff --git a/tests/test_000067.textproto b/tests/test_000067.textproto index bcb8d4f0..ac55c81e 100644 --- a/tests/test_000067.textproto +++ b/tests/test_000067.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,18 +75,14 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] rendering_config { headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO - rendering_config_extension_size: 5 rendering_config_extension_bytes: "extra" } element_mix_gain { @@ -106,7 +104,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -129,15 +126,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000067_f.mp4 b/tests/test_000067_f.mp4 index c441f76d..42ac8046 100644 Binary files a/tests/test_000067_f.mp4 and b/tests/test_000067_f.mp4 differ diff --git a/tests/test_000067_s.mp4 b/tests/test_000067_s.mp4 index 610a479a..ea6860c7 100644 Binary files a/tests/test_000067_s.mp4 and b/tests/test_000067_s.mp4 differ diff --git a/tests/test_000068.iamf b/tests/test_000068.iamf index 20414740..80871679 100644 Binary files a/tests/test_000068.iamf and b/tests/test_000068.iamf differ diff --git a/tests/test_000068.textproto b/tests/test_000068.textproto index 8c466951..ab969419 100644 --- a/tests/test_000068.textproto +++ b/tests/test_000068.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -39,6 +39,11 @@ test_vector_metadata { base_test: "test_000065" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -63,9 +68,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -78,12 +81,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -109,7 +109,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -120,8 +119,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4996 - digital_peak: -3382 + integrated_loudness: -4995 + digital_peak: -3381 } } } @@ -132,15 +131,18 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 2 constant_subblock_duration: 22000 subblocks: [ { diff --git a/tests/test_000068_f.mp4 b/tests/test_000068_f.mp4 index f5e4e8f9..dd364494 100644 Binary files a/tests/test_000068_f.mp4 and b/tests/test_000068_f.mp4 differ diff --git a/tests/test_000068_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000068_rendered_id_42_sub_mix_0_layout_0.wav index 0d6dfbf7..0972b241 100644 Binary files a/tests/test_000068_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000068_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000068_s.mp4 b/tests/test_000068_s.mp4 index ba2b1bee..b025ff25 100644 Binary files a/tests/test_000068_s.mp4 and b/tests/test_000068_s.mp4 differ diff --git a/tests/test_000069.iamf b/tests/test_000069.iamf index b8e443f0..591b8db0 100644 Binary files a/tests/test_000069.iamf and b/tests/test_000069.iamf differ diff --git a/tests/test_000069.textproto b/tests/test_000069.textproto index 2399b670..613d2048 100644 --- a/tests/test_000069.textproto +++ b/tests/test_000069.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,6 +34,11 @@ test_vector_metadata { base_test: "test_000204" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -58,11 +63,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 5 audio_substream_ids: [0, 1, 2, 3, 4] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -79,12 +81,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -110,7 +109,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 3 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -135,7 +133,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4569 + integrated_loudness: -4637 digital_peak: -971 } } @@ -149,8 +147,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4559 + digital_peak: -998 } } } @@ -161,8 +159,16 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 8, 9] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5", "Ltf2", "Rtf2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_2 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000069_f.mp4 b/tests/test_000069_f.mp4 index 5e55d11b..8c060c47 100644 Binary files a/tests/test_000069_f.mp4 and b/tests/test_000069_f.mp4 differ diff --git a/tests/test_000069_s.mp4 b/tests/test_000069_s.mp4 index b6f1a925..fa277b33 100644 Binary files a/tests/test_000069_s.mp4 and b/tests/test_000069_s.mp4 differ diff --git a/tests/test_000070.iamf b/tests/test_000070.iamf index ee6a40ed..42650074 100644 Binary files a/tests/test_000070.iamf and b/tests/test_000070.iamf differ diff --git a/tests/test_000070.textproto b/tests/test_000070.textproto index 3c58a0ee..21e92700 100644 --- a/tests/test_000070.textproto +++ b/tests/test_000070.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -42,6 +42,11 @@ test_vector_metadata { base_test: "test_000209" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -66,9 +71,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 7 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6] - num_parameters: 1 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -78,7 +81,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 } default_demixing_info_parameter_data: { @@ -88,7 +90,6 @@ audio_element_metadata { } } scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -105,12 +106,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -136,7 +134,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 3 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -148,7 +145,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -4013 - digital_peak: 0 + digital_peak: 198 } } layouts { @@ -161,8 +158,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4096 + digital_peak: 98 } } layouts { @@ -175,8 +172,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4112 + digital_peak: -998 } } } @@ -187,8 +184,20 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000070_f.mp4 b/tests/test_000070_f.mp4 index 282264c6..ded341bd 100644 Binary files a/tests/test_000070_f.mp4 and b/tests/test_000070_f.mp4 differ diff --git a/tests/test_000070_s.mp4 b/tests/test_000070_s.mp4 index d094a7b1..f72e6a72 100644 Binary files a/tests/test_000070_s.mp4 and b/tests/test_000070_s.mp4 differ diff --git a/tests/test_000071.textproto b/tests/test_000071.textproto index 83e5284a..f31257a0 100644 --- a/tests/test_000071.textproto +++ b/tests/test_000071.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -42,6 +42,11 @@ test_vector_metadata { partition_mix_gain_parameter_blocks: false } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -66,11 +71,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -87,12 +89,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -120,7 +119,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -143,8 +141,10 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { @@ -152,7 +152,6 @@ parameter_block_metadata { start_timestamp: 0 duration: 1024 constant_subblock_duration: 0 - num_subblocks: 3 subblocks: [ { subblock_duration: 600 @@ -195,7 +194,6 @@ parameter_block_metadata { start_timestamp: 1024 duration: 1024 constant_subblock_duration: 1024 - # num_subblocks: 1 subblocks: [ { # subblock_duration: 1024 @@ -216,7 +214,6 @@ parameter_block_metadata { start_timestamp: 2048 duration: 1024 constant_subblock_duration: 1024 - # num_subblocks: 1 subblocks: [ { # subblock_duration: 1024 @@ -238,7 +235,6 @@ parameter_block_metadata { start_timestamp: 3072 duration: 1024 constant_subblock_duration: 928 - # num_subblocks: 2 subblocks: [ { # subblock_duration: 928 @@ -270,7 +266,6 @@ parameter_block_metadata { start_timestamp: 4096 duration: 1024 constant_subblock_duration: 1024 - # num_subblocks: 1 subblocks: [ { # subblock_duration: 1024 @@ -292,7 +287,6 @@ parameter_block_metadata { start_timestamp: 5120 duration: 1024 constant_subblock_duration: 1024 - # num_subblocks: 1 subblocks: [ { # subblock_duration: 1024 @@ -314,7 +308,6 @@ parameter_block_metadata { start_timestamp: 6144 duration: 1024 constant_subblock_duration: 1024 - # num_subblocks: 1 subblocks: [ { # subblock_duration: 1024 @@ -336,7 +329,6 @@ parameter_block_metadata { start_timestamp: 7168 duration: 1024 constant_subblock_duration: 1024 - # num_subblocks: 1 subblocks: [ { # subblock_duration: 1024 diff --git a/tests/test_000071_f.mp4 b/tests/test_000071_f.mp4 index 043bd750..cd89a7be 100644 Binary files a/tests/test_000071_f.mp4 and b/tests/test_000071_f.mp4 differ diff --git a/tests/test_000072.textproto b/tests/test_000072.textproto index 08578a3b..d0ccb2d6 100644 --- a/tests/test_000072.textproto +++ b/tests/test_000072.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,6 +31,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -45,9 +50,7 @@ codec_config_metadata { decoder_config_flac: { metadata_blocks: { header: { - last_metadata_block_flag: true block_type: FLAC_BLOCK_TYPE_STREAMINFO - metadata_data_block_length: 34 } stream_info { minimum_block_size: 64 @@ -69,11 +72,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -90,12 +90,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -121,7 +118,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -144,15 +140,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000072_f.mp4 b/tests/test_000072_f.mp4 index 063f4d8a..ebaca9d7 100644 Binary files a/tests/test_000072_f.mp4 and b/tests/test_000072_f.mp4 differ diff --git a/tests/test_000073.iamf b/tests/test_000073.iamf index 7d9d0fc6..4f8f8b98 100644 Binary files a/tests/test_000073.iamf and b/tests/test_000073.iamf differ diff --git a/tests/test_000073.textproto b/tests/test_000073.textproto index 3515652c..8c0ca0b0 100644 --- a/tests/test_000073.textproto +++ b/tests/test_000073.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -35,6 +35,11 @@ test_vector_metadata { base_test: "test_000036" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -49,9 +54,7 @@ codec_config_metadata { decoder_config_flac: { metadata_blocks: { header: { - last_metadata_block_flag: true block_type: FLAC_BLOCK_TYPE_STREAMINFO - metadata_data_block_length: 34 } stream_info { minimum_block_size: 512 @@ -73,9 +76,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 1 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -85,7 +86,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 512 - num_subblocks: 1 constant_subblock_duration: 512 } default_demixing_info_parameter_data: { @@ -95,7 +95,6 @@ audio_element_metadata { } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -120,12 +119,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -151,7 +147,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -188,15 +183,20 @@ audio_frame_metadata { samples_to_trim_at_end: 128 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 645120 - num_subblocks: 1 constant_subblock_duration: 645120 subblocks: [ { diff --git a/tests/test_000073_f.mp4 b/tests/test_000073_f.mp4 index da6c7d50..9aeff731 100644 Binary files a/tests/test_000073_f.mp4 and b/tests/test_000073_f.mp4 differ diff --git a/tests/test_000073_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000073_rendered_id_42_sub_mix_0_layout_0.wav index b13b1d2c..d678bf80 100644 Binary files a/tests/test_000073_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000073_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000073_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000073_rendered_id_42_sub_mix_0_layout_1.wav index 88314284..fa243d06 100644 Binary files a/tests/test_000073_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000073_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000073_s.mp4 b/tests/test_000073_s.mp4 index 522014da..2502ff82 100644 Binary files a/tests/test_000073_s.mp4 and b/tests/test_000073_s.mp4 differ diff --git a/tests/test_000074.iamf b/tests/test_000074.iamf index f13683a6..ecbc24eb 100644 Binary files a/tests/test_000074.iamf and b/tests/test_000074.iamf differ diff --git a/tests/test_000074.textproto b/tests/test_000074.textproto index bf42ed59..a6da64f8 100644 --- a/tests/test_000074.textproto +++ b/tests/test_000074.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -46,9 +51,7 @@ codec_config_metadata { decoder_config_flac: { metadata_blocks: { header: { - last_metadata_block_flag: true block_type: FLAC_BLOCK_TYPE_STREAMINFO - metadata_data_block_length: 34 } stream_info { minimum_block_size: 64 @@ -70,9 +73,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -85,12 +86,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -116,7 +114,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -128,7 +125,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -5209 - digital_peak: -4109 + digital_peak: -4110 } } } @@ -139,15 +136,18 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000074_f.mp4 b/tests/test_000074_f.mp4 index 98c79305..c9f19d31 100644 Binary files a/tests/test_000074_f.mp4 and b/tests/test_000074_f.mp4 differ diff --git a/tests/test_000074_s.mp4 b/tests/test_000074_s.mp4 index 263799a3..a719401a 100644 Binary files a/tests/test_000074_s.mp4 and b/tests/test_000074_s.mp4 differ diff --git a/tests/test_000075.textproto b/tests/test_000075.textproto index ac8970c2..02a2efbb 100644 --- a/tests/test_000075.textproto +++ b/tests/test_000075.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000039" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -46,9 +51,7 @@ codec_config_metadata { decoder_config_flac: { metadata_blocks: { header: { - last_metadata_block_flag: true block_type: FLAC_BLOCK_TYPE_STREAMINFO - metadata_data_block_length: 34 } stream_info { minimum_block_size: 64 @@ -70,9 +73,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -85,12 +86,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -116,7 +114,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -139,15 +136,30 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000075_f.mp4 b/tests/test_000075_f.mp4 index 2a547634..fc534751 100644 Binary files a/tests/test_000075_f.mp4 and b/tests/test_000075_f.mp4 differ diff --git a/tests/test_000076.iamf b/tests/test_000076.iamf index 23ca60da..41c6a56d 100644 Binary files a/tests/test_000076.iamf and b/tests/test_000076.iamf differ diff --git a/tests/test_000076.textproto b/tests/test_000076.textproto index b5743225..8d6bb37e 100644 --- a/tests/test_000076.textproto +++ b/tests/test_000076.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,6 +31,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -63,11 +68,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -84,12 +86,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -115,7 +114,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -138,15 +136,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 2048 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 26624 - num_subblocks: 1 constant_subblock_duration: 26624 subblocks: [ { diff --git a/tests/test_000076_f.mp4 b/tests/test_000076_f.mp4 index 535faf39..5f9297d3 100644 Binary files a/tests/test_000076_f.mp4 and b/tests/test_000076_f.mp4 differ diff --git a/tests/test_000076_s.mp4 b/tests/test_000076_s.mp4 index 821a229c..5b3a35b2 100644 Binary files a/tests/test_000076_s.mp4 and b/tests/test_000076_s.mp4 differ diff --git a/tests/test_000077.textproto b/tests/test_000077.textproto index 0f3ae688..39f0ca8c 100644 --- a/tests/test_000077.textproto +++ b/tests/test_000077.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,11 +57,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -73,12 +75,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -104,7 +103,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -138,15 +136,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000077_f.mp4 b/tests/test_000077_f.mp4 index 1de7d4ba..351e8979 100644 Binary files a/tests/test_000077_f.mp4 and b/tests/test_000077_f.mp4 differ diff --git a/tests/test_000078.textproto b/tests/test_000078.textproto index d4bc0640..6dd6baaa 100644 --- a/tests/test_000078.textproto +++ b/tests/test_000078.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000003" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -140,8 +138,10 @@ audio_frame_metadata { samples_to_trim_at_end: 64 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000078_f.mp4 b/tests/test_000078_f.mp4 index 9cbc8fba..900646a3 100644 Binary files a/tests/test_000078_f.mp4 and b/tests/test_000078_f.mp4 differ diff --git a/tests/test_000079.textproto b/tests/test_000079.textproto index 084d2c0f..6b34cbee 100644 --- a/tests/test_000079.textproto +++ b/tests/test_000079.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000078" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -140,8 +138,10 @@ audio_frame_metadata { samples_to_trim_at_end: 64 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000079_f.mp4 b/tests/test_000079_f.mp4 index bbc813ed..d9cab0fc 100644 Binary files a/tests/test_000079_f.mp4 and b/tests/test_000079_f.mp4 differ diff --git a/tests/test_000080.iamf b/tests/test_000080.iamf index 79e80466..6d3b0ec8 100644 Binary files a/tests/test_000080.iamf and b/tests/test_000080.iamf differ diff --git a/tests/test_000080.textproto b/tests/test_000080.textproto index 8d574235..99653912 100644 --- a/tests/test_000080.textproto +++ b/tests/test_000080.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,7 +36,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000054" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -68,9 +72,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 6 audio_substream_ids: [0, 1, 2, 3, 4, 5] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -80,7 +82,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -98,13 +99,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 4 reserved: 0 channel_audio_layer_configs: [ { @@ -145,12 +144,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -176,7 +172,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 4 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -215,7 +210,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6205 digital_peak: -2816 } } @@ -229,7 +224,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6312 digital_peak: -2816 } } @@ -241,15 +236,24 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 8, 9, 10, 11] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 240960 - num_subblocks: 1 constant_subblock_duration: 240960 subblocks: [ { diff --git a/tests/test_000080_f.mp4 b/tests/test_000080_f.mp4 index 45a17cb6..630115bd 100644 Binary files a/tests/test_000080_f.mp4 and b/tests/test_000080_f.mp4 differ diff --git a/tests/test_000080_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000080_rendered_id_42_sub_mix_0_layout_0.wav index ed04493b..fbdda93d 100644 Binary files a/tests/test_000080_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000080_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000080_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000080_rendered_id_42_sub_mix_0_layout_1.wav index dbb1401b..8f09053b 100644 Binary files a/tests/test_000080_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000080_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000080_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000080_rendered_id_42_sub_mix_0_layout_2.wav index 41952eb4..646b79ac 100644 Binary files a/tests/test_000080_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000080_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000080_rendered_id_42_sub_mix_0_layout_3.wav b/tests/test_000080_rendered_id_42_sub_mix_0_layout_3.wav index 3b10e828..7ccc2616 100644 Binary files a/tests/test_000080_rendered_id_42_sub_mix_0_layout_3.wav and b/tests/test_000080_rendered_id_42_sub_mix_0_layout_3.wav differ diff --git a/tests/test_000080_s.mp4 b/tests/test_000080_s.mp4 index 1d62b75e..2cf78b5e 100644 Binary files a/tests/test_000080_s.mp4 and b/tests/test_000080_s.mp4 differ diff --git a/tests/test_000081.iamf b/tests/test_000081.iamf index 54e88183..0bbb0021 100644 Binary files a/tests/test_000081.iamf and b/tests/test_000081.iamf differ diff --git a/tests/test_000081.textproto b/tests/test_000081.textproto index 9fc5db6c..465ba8f6 100644 --- a/tests/test_000081.textproto +++ b/tests/test_000081.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -40,7 +40,11 @@ test_vector_metadata { "7.3.2.1/Rendering a Channel-Based Audio Element to Loudspeakers" ] base_test: "test_000054" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -72,9 +76,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 6 audio_substream_ids: [0, 1, 2, 3, 4, 5] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -84,7 +86,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -102,13 +103,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 4 reserved: 0 channel_audio_layer_configs: [ { @@ -149,12 +148,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -180,7 +176,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 4 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -219,7 +214,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6205 digital_peak: -2816 } } @@ -233,7 +228,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6312 digital_peak: -2816 } } @@ -245,15 +240,24 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 8, 9, 10, 11] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 240960 - num_subblocks: 1 constant_subblock_duration: 240960 subblocks: [ { diff --git a/tests/test_000081_f.mp4 b/tests/test_000081_f.mp4 index 16f12b9c..3236f9ce 100644 Binary files a/tests/test_000081_f.mp4 and b/tests/test_000081_f.mp4 differ diff --git a/tests/test_000081_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000081_rendered_id_42_sub_mix_0_layout_0.wav index ed04493b..fbdda93d 100644 Binary files a/tests/test_000081_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000081_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000081_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000081_rendered_id_42_sub_mix_0_layout_1.wav index dbb1401b..8f09053b 100644 Binary files a/tests/test_000081_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000081_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000081_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000081_rendered_id_42_sub_mix_0_layout_2.wav index 41952eb4..646b79ac 100644 Binary files a/tests/test_000081_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000081_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000081_rendered_id_42_sub_mix_0_layout_3.wav b/tests/test_000081_rendered_id_42_sub_mix_0_layout_3.wav index 3b10e828..7ccc2616 100644 Binary files a/tests/test_000081_rendered_id_42_sub_mix_0_layout_3.wav and b/tests/test_000081_rendered_id_42_sub_mix_0_layout_3.wav differ diff --git a/tests/test_000081_s.mp4 b/tests/test_000081_s.mp4 index 3d63a914..a485e997 100644 Binary files a/tests/test_000081_s.mp4 and b/tests/test_000081_s.mp4 differ diff --git a/tests/test_000082.iamf b/tests/test_000082.iamf index fbdd1ea6..57109aac 100644 Binary files a/tests/test_000082.iamf and b/tests/test_000082.iamf differ diff --git a/tests/test_000082.textproto b/tests/test_000082.textproto index e8ce2ea8..5411c3a8 100644 --- a/tests/test_000082.textproto +++ b/tests/test_000082.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -35,6 +35,11 @@ test_vector_metadata { base_test: "test_000210" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -59,9 +64,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 7 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6] - num_parameters: 1 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -71,7 +74,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 } default_demixing_info_parameter_data: { @@ -81,7 +83,6 @@ audio_element_metadata { } } scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -98,12 +99,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -129,7 +127,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -141,7 +138,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -4013 - digital_peak: 0 + digital_peak: 198 } } layouts { @@ -154,8 +151,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4112 + digital_peak: -998 } } } @@ -166,14 +163,25 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -185,7 +193,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -197,7 +204,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -209,7 +215,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -221,7 +226,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -233,7 +237,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -245,7 +248,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -257,7 +259,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -269,7 +270,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -281,7 +281,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -293,7 +292,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -305,7 +303,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -317,7 +314,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -329,7 +325,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -341,7 +336,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -353,7 +347,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -365,7 +358,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -377,7 +369,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -389,7 +380,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -401,7 +391,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -413,7 +402,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -425,7 +413,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -437,7 +424,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -449,7 +435,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -461,7 +446,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -473,7 +457,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -485,7 +468,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -497,7 +479,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -509,7 +490,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -521,7 +501,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -533,7 +512,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -545,7 +523,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -557,7 +534,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -569,7 +545,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -581,7 +556,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -593,7 +567,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -605,7 +578,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -617,7 +589,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -629,7 +600,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -641,7 +611,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -653,7 +622,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -665,7 +633,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -677,7 +644,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -689,7 +655,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -701,7 +666,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -713,7 +677,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -725,7 +688,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -737,7 +699,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -749,7 +710,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -761,7 +721,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -773,7 +732,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -785,7 +743,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -797,7 +754,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -809,7 +765,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -821,7 +776,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -833,7 +787,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -845,7 +798,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -857,7 +809,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -869,7 +820,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -881,7 +831,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -893,7 +842,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -905,7 +853,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -917,7 +864,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -929,7 +875,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -941,7 +886,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -953,7 +897,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -965,7 +908,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -977,7 +919,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -989,7 +930,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1001,7 +941,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1013,7 +952,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1025,7 +963,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1037,7 +974,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1049,7 +985,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1061,7 +996,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1073,7 +1007,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1085,7 +1018,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1097,7 +1029,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1109,7 +1040,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1121,7 +1051,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1133,7 +1062,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1145,7 +1073,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1157,7 +1084,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1169,7 +1095,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1181,7 +1106,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1193,7 +1117,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1205,7 +1128,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1217,7 +1139,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1229,7 +1150,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1241,7 +1161,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1253,7 +1172,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1265,7 +1183,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1277,7 +1194,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1289,7 +1205,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1301,7 +1216,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1313,7 +1227,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1325,7 +1238,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1337,7 +1249,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1349,7 +1260,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1361,7 +1271,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1373,7 +1282,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1385,7 +1293,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1397,7 +1304,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1409,7 +1315,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1421,7 +1326,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1433,7 +1337,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1445,7 +1348,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1457,7 +1359,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1469,7 +1370,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1481,7 +1381,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1493,7 +1392,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1505,7 +1403,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1517,7 +1414,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1529,7 +1425,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1541,7 +1436,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1553,7 +1447,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1565,7 +1458,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1577,7 +1469,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1589,7 +1480,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1601,7 +1491,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1613,7 +1502,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1625,7 +1513,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1637,7 +1524,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1649,7 +1535,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1661,7 +1546,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1673,7 +1557,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1685,7 +1568,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1697,7 +1579,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1709,7 +1590,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1721,7 +1601,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1733,7 +1612,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1745,7 +1623,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1757,7 +1634,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1769,7 +1645,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1781,7 +1656,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1793,7 +1667,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1805,7 +1678,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1817,7 +1689,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1829,7 +1700,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1841,7 +1711,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1853,7 +1722,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1865,7 +1733,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1877,7 +1744,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1889,7 +1755,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1901,7 +1766,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1913,7 +1777,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1925,7 +1788,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1937,7 +1799,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1949,7 +1810,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1961,7 +1821,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1973,7 +1832,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1985,7 +1843,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -1997,7 +1854,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2009,7 +1865,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2021,7 +1876,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2033,7 +1887,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2045,7 +1898,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2057,7 +1909,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2069,7 +1920,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2081,7 +1931,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2093,7 +1942,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2105,7 +1953,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2117,7 +1964,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2129,7 +1975,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2141,7 +1986,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2153,7 +1997,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2165,7 +2008,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2177,7 +2019,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2189,7 +2030,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2201,7 +2041,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2213,7 +2052,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2225,7 +2063,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2237,7 +2074,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2249,7 +2085,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2261,7 +2096,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2273,7 +2107,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2285,7 +2118,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2297,7 +2129,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2309,7 +2140,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2321,7 +2151,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2333,7 +2162,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2345,7 +2173,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2357,7 +2184,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2369,7 +2195,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2381,7 +2206,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2393,7 +2217,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2405,7 +2228,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2417,7 +2239,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2429,7 +2250,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2441,7 +2261,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2453,7 +2272,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2465,7 +2283,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2477,7 +2294,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2489,7 +2305,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2501,7 +2316,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2513,7 +2327,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2525,7 +2338,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2537,7 +2349,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2549,7 +2360,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2561,7 +2371,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2573,7 +2382,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2585,7 +2393,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2597,7 +2404,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2609,7 +2415,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2621,7 +2426,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2633,7 +2437,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2645,7 +2448,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2657,7 +2459,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2669,7 +2470,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2681,7 +2481,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2693,7 +2492,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2705,7 +2503,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2717,7 +2514,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2729,7 +2525,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2741,7 +2536,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2753,7 +2547,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2765,7 +2558,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2777,7 +2569,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2789,7 +2580,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2801,7 +2591,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2813,7 +2602,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2825,7 +2613,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2837,7 +2624,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2849,7 +2635,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2861,7 +2646,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2873,7 +2657,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2885,7 +2668,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2897,7 +2679,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2909,7 +2690,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2921,7 +2701,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2933,7 +2712,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2945,7 +2723,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2957,7 +2734,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2969,7 +2745,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { @@ -2981,7 +2756,6 @@ parameter_block_metadata { parameter_block_metadata { parameter_id: 100 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 subblocks { demixing_info_parameter_data { diff --git a/tests/test_000082_f.mp4 b/tests/test_000082_f.mp4 index e0b2776f..b4339883 100644 Binary files a/tests/test_000082_f.mp4 and b/tests/test_000082_f.mp4 differ diff --git a/tests/test_000082_s.mp4 b/tests/test_000082_s.mp4 index f88924a8..5d2a1971 100644 Binary files a/tests/test_000082_s.mp4 and b/tests/test_000082_s.mp4 differ diff --git a/tests/test_000083.iamf b/tests/test_000083.iamf index 8fde7175..5aa5b922 100644 Binary files a/tests/test_000083.iamf and b/tests/test_000083.iamf differ diff --git a/tests/test_000083.textproto b/tests/test_000083.textproto index 8ab78c9f..14e65570 100644 --- a/tests/test_000083.textproto +++ b/tests/test_000083.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,6 +34,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -58,9 +63,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -73,17 +76,14 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] rendering_config { - headphones_rendering_mode: HEADPHONES_RENDERING_MODE_BINAURAL + headphones_rendering_mode: HEADPHONES_RENDERING_MODE_BINAURAL_WORLD_LOCKED } element_mix_gain { param_definition { @@ -104,7 +104,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -116,7 +115,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -5209 - digital_peak: -4109 + digital_peak: -4110 } } } @@ -127,15 +126,18 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000083_f.mp4 b/tests/test_000083_f.mp4 index bc971c63..e8684e52 100644 Binary files a/tests/test_000083_f.mp4 and b/tests/test_000083_f.mp4 differ diff --git a/tests/test_000083_s.mp4 b/tests/test_000083_s.mp4 index d6dd6f09..75b10e0d 100644 Binary files a/tests/test_000083_s.mp4 and b/tests/test_000083_s.mp4 differ diff --git a/tests/test_000084.textproto b/tests/test_000084.textproto index 032ae82c..2e51893d 100644 --- a/tests/test_000084.textproto +++ b/tests/test_000084.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,6 +31,11 @@ test_vector_metadata { base_test: "test_000072" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -41,13 +46,13 @@ codec_config_metadata { codec_config { codec_id: CODEC_ID_FLAC num_samples_per_frame: 64 + # Prevent encoder from overriding the invalid `audio_roll_distance` value. + automatically_override_audio_roll_distance: false audio_roll_distance: -1 decoder_config_flac: { metadata_blocks: { header: { - last_metadata_block_flag: true block_type: FLAC_BLOCK_TYPE_STREAMINFO - metadata_data_block_length: 34 } stream_info { minimum_block_size: 64 @@ -69,11 +74,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -90,12 +92,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -121,7 +120,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -144,15 +142,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24000 - num_subblocks: 1 constant_subblock_duration: 24000 subblocks: [ { diff --git a/tests/test_000085.textproto b/tests/test_000085.textproto index 63841c5c..57706682 100644 --- a/tests/test_000085.textproto +++ b/tests/test_000085.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -42,6 +47,8 @@ codec_config_metadata { codec_config { codec_id: CODEC_ID_LPCM num_samples_per_frame: 64 + # Prevent encoder from overriding the invalid `audio_roll_distance` value. + automatically_override_audio_roll_distance: false audio_roll_distance: -1 decoder_config_lpcm { sample_format_flags: LPCM_LITTLE_ENDIAN @@ -56,11 +63,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -77,12 +81,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -108,7 +109,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -131,15 +131,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 8000 - num_subblocks: 1 constant_subblock_duration: 8000 subblocks: [ { diff --git a/tests/test_000086.iamf b/tests/test_000086.iamf index 770be429..46be2d7f 100644 Binary files a/tests/test_000086.iamf and b/tests/test_000086.iamf differ diff --git a/tests/test_000086.textproto b/tests/test_000086.textproto index 930e66bb..10f984dc 100644 --- a/tests/test_000086.textproto +++ b/tests/test_000086.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,6 +34,11 @@ test_vector_metadata { base_test: "test_000300" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_BASE additional_profile: PROFILE_VERSION_BASE @@ -59,9 +64,7 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -76,9 +79,7 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 5 audio_substream_ids: [4, 5, 6, 7, 8] - num_parameters: 1 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -88,7 +89,6 @@ audio_element_metadata: [ param_definition_mode: 0 reserved: 0 duration: 64 - num_subblocks: 1 constant_subblock_duration: 64 } default_demixing_info_parameter_data: { @@ -98,7 +98,6 @@ audio_element_metadata: [ } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -128,12 +127,9 @@ audio_element_metadata: [ mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 2 audio_elements: [ { audio_element_id: 300 @@ -177,7 +173,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 3 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -202,7 +197,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -3871 + integrated_loudness: -3959 digital_peak: -774 } } @@ -216,7 +211,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -3939 + integrated_loudness: -3738 digital_peak: -950 } } @@ -229,8 +224,12 @@ audio_frame_metadata: [ samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] }, { # Not using every channel in the input wav file. @@ -238,8 +237,16 @@ audio_frame_metadata: [ samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 301 - channel_ids: [0, 1, 2, 3, 4, 5, 8, 9] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5", "Ltf2", "Rtf2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_2 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_2 } + ] } ] diff --git a/tests/test_000086_f.mp4 b/tests/test_000086_f.mp4 index 59b82986..0b63093b 100644 Binary files a/tests/test_000086_f.mp4 and b/tests/test_000086_f.mp4 differ diff --git a/tests/test_000086_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000086_rendered_id_42_sub_mix_0_layout_0.wav index 4b6d4865..8e58181b 100644 Binary files a/tests/test_000086_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000086_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000086_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000086_rendered_id_42_sub_mix_0_layout_1.wav index 50f9bc67..0007e913 100644 Binary files a/tests/test_000086_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000086_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000086_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000086_rendered_id_42_sub_mix_0_layout_2.wav index d61c0632..f824a90a 100644 Binary files a/tests/test_000086_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000086_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000086_s.mp4 b/tests/test_000086_s.mp4 index da3ce93f..6511ecb9 100644 Binary files a/tests/test_000086_s.mp4 and b/tests/test_000086_s.mp4 differ diff --git a/tests/test_000087.iamf b/tests/test_000087.iamf index cb8f886c..cd9e26af 100644 Binary files a/tests/test_000087.iamf and b/tests/test_000087.iamf differ diff --git a/tests/test_000087.textproto b/tests/test_000087.textproto index d10731f9..4b2b50fd 100644 --- a/tests/test_000087.textproto +++ b/tests/test_000087.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -33,7 +33,11 @@ test_vector_metadata { "8.5.1/Loudness Information" ] base_test: "test_000405" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -66,9 +70,7 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -78,7 +80,6 @@ audio_element_metadata: [ param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -96,13 +97,11 @@ audio_element_metadata: [ param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -129,11 +128,8 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [4] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -151,12 +147,9 @@ audio_element_metadata: [ mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 2 audio_elements: [ { audio_element_id: 300 @@ -200,7 +193,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -238,16 +230,24 @@ audio_frame_metadata: [ samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] }, { wav_filename: "dialog_clip_stereo.wav" samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 301 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } ] diff --git a/tests/test_000087_f.mp4 b/tests/test_000087_f.mp4 index 7417b8b4..f292c081 100644 Binary files a/tests/test_000087_f.mp4 and b/tests/test_000087_f.mp4 differ diff --git a/tests/test_000087_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000087_rendered_id_42_sub_mix_0_layout_0.wav index 73cf5466..fd0b5a68 100644 Binary files a/tests/test_000087_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000087_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000087_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000087_rendered_id_42_sub_mix_0_layout_1.wav index e19d0f49..a2eeb6a5 100644 Binary files a/tests/test_000087_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000087_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000087_s.mp4 b/tests/test_000087_s.mp4 index 9a5a4dcb..f23fbdc0 100644 Binary files a/tests/test_000087_s.mp4 and b/tests/test_000087_s.mp4 differ diff --git a/tests/test_000088.textproto b/tests/test_000088.textproto index a1b7fcce..bb772638 100644 --- a/tests/test_000088.textproto +++ b/tests/test_000088.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -48,6 +48,11 @@ test_vector_metadata { partition_mix_gain_parameter_blocks: false } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -72,11 +77,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -93,12 +95,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -123,12 +122,10 @@ mix_presentation_metadata { reserved: 0 duration: 1024 constant_subblock_duration: 0 - num_subblocks: 3 subblock_durations: [256, 512, 256] } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -151,8 +148,10 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { diff --git a/tests/test_000088_f.mp4 b/tests/test_000088_f.mp4 index 80869378..52a1958e 100644 Binary files a/tests/test_000088_f.mp4 and b/tests/test_000088_f.mp4 differ diff --git a/tests/test_000088_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000088_rendered_id_42_sub_mix_0_layout_0.wav index 0f4b1243..5481df37 100644 Binary files a/tests/test_000088_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000088_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000089.iamf b/tests/test_000089.iamf index 434646bd..5d765806 100644 Binary files a/tests/test_000089.iamf and b/tests/test_000089.iamf differ diff --git a/tests/test_000089.textproto b/tests/test_000089.textproto index 58b54ef0..c9fe451a 100644 --- a/tests/test_000089.textproto +++ b/tests/test_000089.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -42,7 +42,11 @@ test_vector_metadata { "7.3.2.3/Rendering a Channel-Based Audio Element to Headphones" ] base_test: "test_000050" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -74,9 +78,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 7 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -86,7 +88,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -104,13 +105,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 4 reserved: 0 channel_audio_layer_configs: [ { @@ -151,17 +150,14 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] rendering_config { - headphones_rendering_mode: HEADPHONES_RENDERING_MODE_BINAURAL + headphones_rendering_mode: HEADPHONES_RENDERING_MODE_BINAURAL_WORLD_LOCKED } element_mix_gain { param_definition { @@ -182,7 +178,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 4 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -207,7 +202,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6276 + integrated_loudness: -6424 digital_peak: -2687 } } @@ -221,7 +216,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -7098 + integrated_loudness: -6436 digital_peak: -2816 } } @@ -235,7 +230,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -7098 + integrated_loudness: -6529 digital_peak: -2816 } } @@ -247,15 +242,26 @@ audio_frame_metadata { samples_to_trim_at_end: 264 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 1093440 - num_subblocks: 1 constant_subblock_duration: 1093440 subblocks: [ { diff --git a/tests/test_000089_f.mp4 b/tests/test_000089_f.mp4 index 5ba7fe24..a80eb1cb 100644 Binary files a/tests/test_000089_f.mp4 and b/tests/test_000089_f.mp4 differ diff --git a/tests/test_000089_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000089_rendered_id_42_sub_mix_0_layout_0.wav index 40101559..363a8e3c 100644 Binary files a/tests/test_000089_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000089_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000089_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000089_rendered_id_42_sub_mix_0_layout_1.wav index 268f528d..446caa8c 100644 Binary files a/tests/test_000089_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000089_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000089_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000089_rendered_id_42_sub_mix_0_layout_2.wav index bdd56c03..af4ff7b6 100644 Binary files a/tests/test_000089_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000089_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000089_rendered_id_42_sub_mix_0_layout_3.wav b/tests/test_000089_rendered_id_42_sub_mix_0_layout_3.wav index cd9f3de6..68a57293 100644 Binary files a/tests/test_000089_rendered_id_42_sub_mix_0_layout_3.wav and b/tests/test_000089_rendered_id_42_sub_mix_0_layout_3.wav differ diff --git a/tests/test_000089_s.mp4 b/tests/test_000089_s.mp4 index fc111bb1..0635e5dc 100644 Binary files a/tests/test_000089_s.mp4 and b/tests/test_000089_s.mp4 differ diff --git a/tests/test_000090.iamf b/tests/test_000090.iamf index a89d61e0..6512cd73 100644 Binary files a/tests/test_000090.iamf and b/tests/test_000090.iamf differ diff --git a/tests/test_000090.textproto b/tests/test_000090.textproto index fede89c4..5e106e82 100644 --- a/tests/test_000090.textproto +++ b/tests/test_000090.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000076" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -64,11 +69,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -85,12 +87,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -116,7 +115,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -139,15 +137,16 @@ audio_frame_metadata { samples_to_trim_at_end: 576 samples_to_trim_at_start: 2048 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 26624 - num_subblocks: 1 constant_subblock_duration: 26624 subblocks: [ { diff --git a/tests/test_000090_f.mp4 b/tests/test_000090_f.mp4 index 644813ce..2681d620 100644 Binary files a/tests/test_000090_f.mp4 and b/tests/test_000090_f.mp4 differ diff --git a/tests/test_000090_s.mp4 b/tests/test_000090_s.mp4 index d9cc9839..089b116c 100644 Binary files a/tests/test_000090_s.mp4 and b/tests/test_000090_s.mp4 differ diff --git a/tests/test_000091.textproto b/tests/test_000091.textproto index c5418ecb..7b0bdfd8 100644 --- a/tests/test_000091.textproto +++ b/tests/test_000091.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,6 +31,11 @@ test_vector_metadata { base_test: "test_000076" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -41,6 +46,8 @@ codec_config_metadata { codec_config { codec_id: CODEC_ID_AAC_LC num_samples_per_frame: 1024 + # Prevent encoder from overriding the invalid `audio_roll_distance` value. + automatically_override_audio_roll_distance: false audio_roll_distance: 0 decoder_config_aac: { buffer_size_db: 0 @@ -63,11 +70,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -84,12 +88,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -115,7 +116,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -138,15 +138,16 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 2048 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 26624 - num_subblocks: 1 constant_subblock_duration: 26624 subblocks: [ { diff --git a/tests/test_000092.iamf b/tests/test_000092.iamf index 7bcb36de..57a89f81 100644 Binary files a/tests/test_000092.iamf and b/tests/test_000092.iamf differ diff --git a/tests/test_000092.textproto b/tests/test_000092.textproto index b45607d6..81b0d49a 100644 --- a/tests/test_000092.textproto +++ b/tests/test_000092.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000049" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -68,9 +73,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -80,7 +83,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 } default_demixing_info_parameter_data: { @@ -98,13 +100,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -129,12 +129,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -160,7 +157,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -197,8 +193,14 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 2048 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000092_f.mp4 b/tests/test_000092_f.mp4 index 52c5b24d..a67205ba 100644 Binary files a/tests/test_000092_f.mp4 and b/tests/test_000092_f.mp4 differ diff --git a/tests/test_000092_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000092_rendered_id_42_sub_mix_0_layout_0.wav index b13b1d2c..d678bf80 100644 Binary files a/tests/test_000092_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000092_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000092_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000092_rendered_id_42_sub_mix_0_layout_1.wav index 88314284..fa243d06 100644 Binary files a/tests/test_000092_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000092_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000092_s.mp4 b/tests/test_000092_s.mp4 index 6f5e3198..d1938e35 100644 Binary files a/tests/test_000092_s.mp4 and b/tests/test_000092_s.mp4 differ diff --git a/tests/test_000093.iamf b/tests/test_000093.iamf index a8c933ca..4db07507 100644 Binary files a/tests/test_000093.iamf and b/tests/test_000093.iamf differ diff --git a/tests/test_000093.textproto b/tests/test_000093.textproto index f234138b..68b4167e 100644 --- a/tests/test_000093.textproto +++ b/tests/test_000093.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -37,6 +37,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -69,9 +74,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -84,12 +87,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -115,7 +115,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,7 +126,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -5209 - digital_peak: -4109 + digital_peak: -4110 } } } @@ -138,15 +137,18 @@ audio_frame_metadata { samples_to_trim_at_end: 576 samples_to_trim_at_start: 2048 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 26624 - num_subblocks: 1 constant_subblock_duration: 26624 subblocks: [ { diff --git a/tests/test_000093_f.mp4 b/tests/test_000093_f.mp4 index c6428fe9..1c22cba9 100644 Binary files a/tests/test_000093_f.mp4 and b/tests/test_000093_f.mp4 differ diff --git a/tests/test_000093_s.mp4 b/tests/test_000093_s.mp4 index 82e306eb..18fe5892 100644 Binary files a/tests/test_000093_s.mp4 and b/tests/test_000093_s.mp4 differ diff --git a/tests/test_000094.iamf b/tests/test_000094.iamf index cb1c0a8f..8eca30dc 100644 Binary files a/tests/test_000094.iamf and b/tests/test_000094.iamf differ diff --git a/tests/test_000094.textproto b/tests/test_000094.textproto index 1855de3a..71e3ecd1 100644 --- a/tests/test_000094.textproto +++ b/tests/test_000094.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -35,6 +35,11 @@ test_vector_metadata { base_test: "test_000039" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -67,9 +72,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -82,12 +85,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -113,7 +113,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -136,15 +135,30 @@ audio_frame_metadata { samples_to_trim_at_end: 576 samples_to_trim_at_start: 2048 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 26624 - num_subblocks: 1 constant_subblock_duration: 26624 subblocks: [ { diff --git a/tests/test_000094_f.mp4 b/tests/test_000094_f.mp4 index a2a566bc..9e4d7115 100644 Binary files a/tests/test_000094_f.mp4 and b/tests/test_000094_f.mp4 differ diff --git a/tests/test_000094_s.mp4 b/tests/test_000094_s.mp4 index c8928bbc..d44eac2c 100644 Binary files a/tests/test_000094_s.mp4 and b/tests/test_000094_s.mp4 differ diff --git a/tests/test_000095.iamf b/tests/test_000095.iamf index 97451154..98cea932 100644 Binary files a/tests/test_000095.iamf and b/tests/test_000095.iamf differ diff --git a/tests/test_000095.textproto b/tests/test_000095.textproto index 906f6fbd..50df4674 100644 --- a/tests/test_000095.textproto +++ b/tests/test_000095.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -45,6 +45,11 @@ test_vector_metadata { base_test: "test_000050" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -69,9 +74,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 7 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6] - num_parameters: 1 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -81,7 +84,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 } default_demixing_info_parameter_data: { @@ -91,7 +93,6 @@ audio_element_metadata { } } scalable_channel_layout_config { - num_layers: 4 reserved: 0 channel_audio_layer_configs: [ { @@ -132,12 +133,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -163,7 +161,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 5 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -188,8 +185,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -5929 - digital_peak: -2688 + integrated_loudness: -6084 + digital_peak: -2687 } } layouts { @@ -202,7 +199,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6092 digital_peak: -2816 } } @@ -216,7 +213,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -6783 + integrated_loudness: -6189 digital_peak: -2816 } } @@ -229,8 +226,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -32768 # Loudness value should be ignored. - digital_peak: -32768 # Loudness value should be ignored. + integrated_loudness: -6110 + digital_peak: -2108 } } } @@ -241,8 +238,20 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000095_f.mp4 b/tests/test_000095_f.mp4 index ee6eb3f1..d6c9f629 100644 Binary files a/tests/test_000095_f.mp4 and b/tests/test_000095_f.mp4 differ diff --git a/tests/test_000095_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000095_rendered_id_42_sub_mix_0_layout_0.wav index 48d3767a..94ecf56b 100644 Binary files a/tests/test_000095_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000095_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000095_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000095_rendered_id_42_sub_mix_0_layout_1.wav index 83d07edb..20e39c5d 100644 Binary files a/tests/test_000095_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000095_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000095_rendered_id_42_sub_mix_0_layout_2.wav b/tests/test_000095_rendered_id_42_sub_mix_0_layout_2.wav index 82db283d..10c9f6c1 100644 Binary files a/tests/test_000095_rendered_id_42_sub_mix_0_layout_2.wav and b/tests/test_000095_rendered_id_42_sub_mix_0_layout_2.wav differ diff --git a/tests/test_000095_rendered_id_42_sub_mix_0_layout_3.wav b/tests/test_000095_rendered_id_42_sub_mix_0_layout_3.wav index 688a639b..7d3de182 100644 Binary files a/tests/test_000095_rendered_id_42_sub_mix_0_layout_3.wav and b/tests/test_000095_rendered_id_42_sub_mix_0_layout_3.wav differ diff --git a/tests/test_000095_rendered_id_42_sub_mix_0_layout_4.wav b/tests/test_000095_rendered_id_42_sub_mix_0_layout_4.wav index 8de0605d..94ecf56b 100644 Binary files a/tests/test_000095_rendered_id_42_sub_mix_0_layout_4.wav and b/tests/test_000095_rendered_id_42_sub_mix_0_layout_4.wav differ diff --git a/tests/test_000095_s.mp4 b/tests/test_000095_s.mp4 index 258ec54c..3cad661f 100644 Binary files a/tests/test_000095_s.mp4 and b/tests/test_000095_s.mp4 differ diff --git a/tests/test_000096.iamf b/tests/test_000096.iamf index 8939f889..cff3e392 100644 Binary files a/tests/test_000096.iamf and b/tests/test_000096.iamf differ diff --git a/tests/test_000096.textproto b/tests/test_000096.textproto index a7bd528c..453a2913 100644 --- a/tests/test_000096.textproto +++ b/tests/test_000096.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -35,6 +35,11 @@ test_vector_metadata { base_test: "test_000103" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -59,9 +64,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -74,17 +77,14 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] rendering_config { - headphones_rendering_mode: HEADPHONES_RENDERING_MODE_BINAURAL + headphones_rendering_mode: HEADPHONES_RENDERING_MODE_BINAURAL_WORLD_LOCKED } element_mix_gain { param_definition { @@ -105,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -117,7 +116,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2834 - digital_peak: 0 + digital_peak: 55 } } layouts { @@ -129,8 +128,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -32768 # Loudness value should be ignored. - digital_peak: -32768 # Loudness value should be ignored. + integrated_loudness: -3237 + digital_peak: -127 } } } @@ -141,8 +140,24 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000096_f.mp4 b/tests/test_000096_f.mp4 index 449688b8..0fc67477 100644 Binary files a/tests/test_000096_f.mp4 and b/tests/test_000096_f.mp4 differ diff --git a/tests/test_000096_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000096_rendered_id_42_sub_mix_0_layout_1.wav index ad37169e..5f06de94 100644 Binary files a/tests/test_000096_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000096_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000096_s.mp4 b/tests/test_000096_s.mp4 index bc9afa51..169178dd 100644 Binary files a/tests/test_000096_s.mp4 and b/tests/test_000096_s.mp4 differ diff --git a/tests/test_000097.textproto b/tests/test_000097.textproto index 73d4274c..17dd3f93 100644 --- a/tests/test_000097.textproto +++ b/tests/test_000097.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000031" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -143,8 +141,9 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0] - channel_labels: ["M"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_MONO } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000097_f.mp4 b/tests/test_000097_f.mp4 index 2abf27b8..b14da503 100644 Binary files a/tests/test_000097_f.mp4 and b/tests/test_000097_f.mp4 differ diff --git a/tests/test_000097_s.mp4 b/tests/test_000097_s.mp4 index 60f388b6..8ec2ef49 100644 Binary files a/tests/test_000097_s.mp4 and b/tests/test_000097_s.mp4 differ diff --git a/tests/test_000098.iamf b/tests/test_000098.iamf index f30992e2..1fbc8b7c 100644 Binary files a/tests/test_000098.iamf and b/tests/test_000098.iamf differ diff --git a/tests/test_000098.textproto b/tests/test_000098.textproto index 704eea23..24e727ff 100644 --- a/tests/test_000098.textproto +++ b/tests/test_000098.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,7 +34,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000049" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -66,9 +70,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -78,7 +80,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 2880 - num_subblocks: 1 constant_subblock_duration: 2880 } default_demixing_info_parameter_data: { @@ -96,13 +97,11 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 2880 - num_subblocks: 1 constant_subblock_duration: 2880 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -127,12 +126,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -158,7 +154,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -195,15 +190,20 @@ audio_frame_metadata { samples_to_trim_at_end: 1608 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 648000 - num_subblocks: 1 constant_subblock_duration: 648000 subblocks: [ { diff --git a/tests/test_000098_f.mp4 b/tests/test_000098_f.mp4 index db3852fb..ac6215fb 100644 Binary files a/tests/test_000098_f.mp4 and b/tests/test_000098_f.mp4 differ diff --git a/tests/test_000098_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000098_rendered_id_42_sub_mix_0_layout_0.wav index b13b1d2c..d678bf80 100644 Binary files a/tests/test_000098_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000098_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000098_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000098_rendered_id_42_sub_mix_0_layout_1.wav index 88314284..fa243d06 100644 Binary files a/tests/test_000098_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000098_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000098_s.mp4 b/tests/test_000098_s.mp4 index a4f5169d..7b660e86 100644 Binary files a/tests/test_000098_s.mp4 and b/tests/test_000098_s.mp4 differ diff --git a/tests/test_000100.textproto b/tests/test_000100.textproto index 67ad2c5c..645e7d23 100644 --- a/tests/test_000100.textproto +++ b/tests/test_000100.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -56,9 +61,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -71,12 +74,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -102,7 +102,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -125,8 +124,9 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0] - channel_labels: ["A0"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000100_f.mp4 b/tests/test_000100_f.mp4 index 429d9fab..3c4c5e76 100644 Binary files a/tests/test_000100_f.mp4 and b/tests/test_000100_f.mp4 differ diff --git a/tests/test_000101.iamf b/tests/test_000101.iamf index abb63b4c..c7b2e2c0 100644 Binary files a/tests/test_000101.iamf and b/tests/test_000101.iamf differ diff --git a/tests/test_000101.textproto b/tests/test_000101.textproto index f796b2c6..698cdf8a 100644 --- a/tests/test_000101.textproto +++ b/tests/test_000101.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -56,9 +61,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -71,12 +74,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -102,7 +102,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -114,7 +113,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2631 - digital_peak: 0 + digital_peak: 203 } } } @@ -125,8 +124,12 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000101_f.mp4 b/tests/test_000101_f.mp4 index 25ca3645..29828be5 100644 Binary files a/tests/test_000101_f.mp4 and b/tests/test_000101_f.mp4 differ diff --git a/tests/test_000101_s.mp4 b/tests/test_000101_s.mp4 index 93d14839..3811cc68 100644 Binary files a/tests/test_000101_s.mp4 and b/tests/test_000101_s.mp4 differ diff --git a/tests/test_000102.iamf b/tests/test_000102.iamf index bf35b3eb..257cf85c 100644 Binary files a/tests/test_000102.iamf and b/tests/test_000102.iamf differ diff --git a/tests/test_000102.textproto b/tests/test_000102.textproto index 1029ac84..76d128e6 100644 --- a/tests/test_000102.textproto +++ b/tests/test_000102.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000038" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -56,9 +61,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 9 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -71,12 +74,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -102,7 +102,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -114,7 +113,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2853 - digital_peak: 0 + digital_peak: 14 } } } @@ -125,8 +124,17 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000102_f.mp4 b/tests/test_000102_f.mp4 index a9834058..3d76ee6a 100644 Binary files a/tests/test_000102_f.mp4 and b/tests/test_000102_f.mp4 differ diff --git a/tests/test_000102_s.mp4 b/tests/test_000102_s.mp4 index 0d9ea6de..cd19e325 100644 Binary files a/tests/test_000102_s.mp4 and b/tests/test_000102_s.mp4 differ diff --git a/tests/test_000103.iamf b/tests/test_000103.iamf index aa09bfb2..c7cd4c30 100644 Binary files a/tests/test_000103.iamf and b/tests/test_000103.iamf differ diff --git a/tests/test_000103.textproto b/tests/test_000103.textproto index 9b408942..b49ab359 100644 --- a/tests/test_000103.textproto +++ b/tests/test_000103.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000039" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -56,9 +61,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -71,12 +74,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -102,7 +102,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -114,7 +113,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2834 - digital_peak: 0 + digital_peak: 55 } } } @@ -125,8 +124,24 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000103_f.mp4 b/tests/test_000103_f.mp4 index 845d8ddd..632afa42 100644 Binary files a/tests/test_000103_f.mp4 and b/tests/test_000103_f.mp4 differ diff --git a/tests/test_000103_s.mp4 b/tests/test_000103_s.mp4 index 3b459d7a..7e6179ab 100644 Binary files a/tests/test_000103_s.mp4 and b/tests/test_000103_s.mp4 differ diff --git a/tests/test_000104.textproto b/tests/test_000104.textproto index 292f0658..155c7d22 100644 --- a/tests/test_000104.textproto +++ b/tests/test_000104.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000042" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,9 +57,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { @@ -68,12 +71,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -99,7 +99,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -122,8 +121,9 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0] - channel_labels: ["A0"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000104_f.mp4 b/tests/test_000104_f.mp4 index ca0e0899..0999765b 100644 Binary files a/tests/test_000104_f.mp4 and b/tests/test_000104_f.mp4 differ diff --git a/tests/test_000105.iamf b/tests/test_000105.iamf index e72612a0..263c4630 100644 Binary files a/tests/test_000105.iamf and b/tests/test_000105.iamf differ diff --git a/tests/test_000105.textproto b/tests/test_000105.textproto index 68de2793..a14c2567 100644 --- a/tests/test_000105.textproto +++ b/tests/test_000105.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -34,6 +33,11 @@ test_vector_metadata { base_test: "test_000042" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -58,33 +62,30 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 4 substream_count: 4 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, # col 0 0, 32767, 0, 0, # col 1 0, 0, 32767, 0, # col 2 0, 0, 0, 32767 # col 3 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -93,7 +94,7 @@ mix_presentation_metadata { } element_mix_gain { param_definition { - parameter_id: 999 # Non-existent; default will be used + parameter_id: 999 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 @@ -103,14 +104,13 @@ mix_presentation_metadata { } output_mix_gain { param_definition { - parameter_id: 998 # Non-existent; default will be used + parameter_id: 998 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -122,7 +122,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2631 - digital_peak: 0 + digital_peak: 203 } } } @@ -133,8 +133,12 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000105_f.mp4 b/tests/test_000105_f.mp4 index 2a16fb4c..40ec8425 100644 Binary files a/tests/test_000105_f.mp4 and b/tests/test_000105_f.mp4 differ diff --git a/tests/test_000105_s.mp4 b/tests/test_000105_s.mp4 index 37b054e1..45a2dfd9 100644 Binary files a/tests/test_000105_s.mp4 and b/tests/test_000105_s.mp4 differ diff --git a/tests/test_000106.iamf b/tests/test_000106.iamf index 894b307d..5ddd1c47 100644 Binary files a/tests/test_000106.iamf and b/tests/test_000106.iamf differ diff --git a/tests/test_000106.textproto b/tests/test_000106.textproto index 4ad480f1..a0d01293 100644 --- a/tests/test_000106.textproto +++ b/tests/test_000106.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -34,6 +33,11 @@ test_vector_metadata { base_test: "test_000042" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -58,15 +62,14 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 9 - audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8 ] - num_parameters: 0 + audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8] ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 9 substream_count: 9 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, 0, 0, 0, 0, 0, # col 0 0, 32767, 0, 0, 0, 0, 0, 0, 0, # col 1 @@ -78,18 +81,16 @@ audio_element_metadata { 0, 0, 0, 0, 0, 0, 0, 32767, 0, # col 7 0, 0, 0, 0, 0, 0, 0, 0, 32767 # col 8 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -98,7 +99,7 @@ mix_presentation_metadata { } element_mix_gain { param_definition { - parameter_id: 999 # Non-existent; default will be used + parameter_id: 999 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 @@ -108,14 +109,13 @@ mix_presentation_metadata { } output_mix_gain { param_definition { - parameter_id: 998 # Non-existent; default will be used + parameter_id: 998 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -127,7 +127,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2853 - digital_peak: 0 + digital_peak: 14 } } } @@ -138,8 +138,17 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000106_f.mp4 b/tests/test_000106_f.mp4 index 7e26d506..2f98a616 100644 Binary files a/tests/test_000106_f.mp4 and b/tests/test_000106_f.mp4 differ diff --git a/tests/test_000106_s.mp4 b/tests/test_000106_s.mp4 index a9be5f1a..58c0faf6 100644 Binary files a/tests/test_000106_s.mp4 and b/tests/test_000106_s.mp4 differ diff --git a/tests/test_000107.iamf b/tests/test_000107.iamf index 89e946aa..f89f9f94 100644 Binary files a/tests/test_000107.iamf and b/tests/test_000107.iamf differ diff --git a/tests/test_000107.textproto b/tests/test_000107.textproto index ac43a1cb..95289e43 100644 --- a/tests/test_000107.textproto +++ b/tests/test_000107.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -34,6 +33,11 @@ test_vector_metadata { base_test: "test_000043" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -58,15 +62,14 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 16 substream_count: 16 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 0 0, 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 1 @@ -85,18 +88,16 @@ audio_element_metadata { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32767, 0, # col 14 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32767 # col 15 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -105,7 +106,7 @@ mix_presentation_metadata { } element_mix_gain { param_definition { - parameter_id: 999 # Non-existent; default will be used + parameter_id: 999 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 @@ -115,14 +116,13 @@ mix_presentation_metadata { } output_mix_gain { param_definition { - parameter_id: 998 # Non-existent; default will be used + parameter_id: 998 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -134,7 +134,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2834 - digital_peak: 0 + digital_peak: 55 } } } @@ -145,8 +145,24 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000107_f.mp4 b/tests/test_000107_f.mp4 index 849c8233..ad5a477e 100644 Binary files a/tests/test_000107_f.mp4 and b/tests/test_000107_f.mp4 differ diff --git a/tests/test_000107_s.mp4 b/tests/test_000107_s.mp4 index f46b9a60..6894daca 100644 Binary files a/tests/test_000107_s.mp4 and b/tests/test_000107_s.mp4 differ diff --git a/tests/test_000108.iamf b/tests/test_000108.iamf index 6183c625..3430bd00 100644 Binary files a/tests/test_000108.iamf and b/tests/test_000108.iamf differ diff --git a/tests/test_000108.textproto b/tests/test_000108.textproto index fa99a25e..b85d00eb 100644 --- a/tests/test_000108.textproto +++ b/tests/test_000108.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -29,7 +29,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000100" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -61,9 +65,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -76,12 +78,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -107,7 +106,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -130,8 +128,9 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0] - channel_labels: ["A0"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000108_f.mp4 b/tests/test_000108_f.mp4 index 3650bd44..1b1093ce 100644 Binary files a/tests/test_000108_f.mp4 and b/tests/test_000108_f.mp4 differ diff --git a/tests/test_000108_s.mp4 b/tests/test_000108_s.mp4 index ae535648..ba6d112e 100644 Binary files a/tests/test_000108_s.mp4 and b/tests/test_000108_s.mp4 differ diff --git a/tests/test_000109.iamf b/tests/test_000109.iamf index 10f303b5..5330f8a3 100644 Binary files a/tests/test_000109.iamf and b/tests/test_000109.iamf differ diff --git a/tests/test_000109.textproto b/tests/test_000109.textproto index 4539a830..33bf3900 100644 --- a/tests/test_000109.textproto +++ b/tests/test_000109.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "7.5.2/Limiter" ] base_test: "test_000101" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,9 +67,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -78,12 +80,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -109,7 +108,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -121,7 +119,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2631 - digital_peak: 0 + digital_peak: 203 } } } @@ -132,8 +130,12 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000109_f.mp4 b/tests/test_000109_f.mp4 index 66fb037e..5cbfed56 100644 Binary files a/tests/test_000109_f.mp4 and b/tests/test_000109_f.mp4 differ diff --git a/tests/test_000109_s.mp4 b/tests/test_000109_s.mp4 index c17b20bb..f5b03c59 100644 Binary files a/tests/test_000109_s.mp4 and b/tests/test_000109_s.mp4 differ diff --git a/tests/test_000110.iamf b/tests/test_000110.iamf index e854524f..8f14a8d5 100644 Binary files a/tests/test_000110.iamf and b/tests/test_000110.iamf differ diff --git a/tests/test_000110.textproto b/tests/test_000110.textproto index 27f0ccd0..f1900c3e 100644 --- a/tests/test_000110.textproto +++ b/tests/test_000110.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "7.5.2/Limiter" ] base_test: "test_000102" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,9 +67,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 9 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -78,12 +80,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -109,7 +108,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -121,7 +119,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2853 - digital_peak: 0 + digital_peak: 14 } } } @@ -132,8 +130,17 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000110_f.mp4 b/tests/test_000110_f.mp4 index bdbb2fb6..17305121 100644 Binary files a/tests/test_000110_f.mp4 and b/tests/test_000110_f.mp4 differ diff --git a/tests/test_000110_s.mp4 b/tests/test_000110_s.mp4 index e8836cae..daeeeefd 100644 Binary files a/tests/test_000110_s.mp4 and b/tests/test_000110_s.mp4 differ diff --git a/tests/test_000111.iamf b/tests/test_000111.iamf index 0b60c0ff..bbe0c6b2 100644 Binary files a/tests/test_000111.iamf and b/tests/test_000111.iamf differ diff --git a/tests/test_000111.textproto b/tests/test_000111.textproto index 93826380..80413d3a 100644 --- a/tests/test_000111.textproto +++ b/tests/test_000111.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -31,7 +31,11 @@ test_vector_metadata { "7.5.2/Limiter" ] base_test: "test_000103" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -63,9 +67,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -78,12 +80,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -109,7 +108,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -121,7 +119,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2834 - digital_peak: 0 + digital_peak: 55 } } } @@ -132,8 +130,24 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000111_f.mp4 b/tests/test_000111_f.mp4 index 101b00b3..5017945b 100644 Binary files a/tests/test_000111_f.mp4 and b/tests/test_000111_f.mp4 differ diff --git a/tests/test_000111_s.mp4 b/tests/test_000111_s.mp4 index 8408e11d..78dd13c7 100644 Binary files a/tests/test_000111_s.mp4 and b/tests/test_000111_s.mp4 differ diff --git a/tests/test_000112.iamf b/tests/test_000112.iamf index e427de60..cd4f1d08 100644 Binary files a/tests/test_000112.iamf and b/tests/test_000112.iamf differ diff --git a/tests/test_000112.textproto b/tests/test_000112.textproto index 6cbf4f2e..c92be6fe 100644 --- a/tests/test_000112.textproto +++ b/tests/test_000112.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -29,7 +29,11 @@ test_vector_metadata { "3.11.1/OPUS Specific" ] base_test: "test_000104" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -61,9 +65,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { @@ -77,12 +79,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -108,7 +107,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -131,8 +129,9 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0] - channel_labels: ["A0"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000112_f.mp4 b/tests/test_000112_f.mp4 index 3b17f8fa..aed51040 100644 Binary files a/tests/test_000112_f.mp4 and b/tests/test_000112_f.mp4 differ diff --git a/tests/test_000112_s.mp4 b/tests/test_000112_s.mp4 index 73f442b6..7d29ccd3 100644 Binary files a/tests/test_000112_s.mp4 and b/tests/test_000112_s.mp4 differ diff --git a/tests/test_000113.iamf b/tests/test_000113.iamf index c6f10372..c3679ec7 100644 Binary files a/tests/test_000113.iamf and b/tests/test_000113.iamf differ diff --git a/tests/test_000113.textproto b/tests/test_000113.textproto index 1f9098e0..762a7466 100644 --- a/tests/test_000113.textproto +++ b/tests/test_000113.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -33,7 +32,11 @@ test_vector_metadata { "7.5.2/Limiter" ] base_test: "test_000105" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -65,33 +68,30 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 4 substream_count: 4 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, # col 0 0, 32767, 0, 0, # col 1 0, 0, 32767, 0, # col 2 0, 0, 0, 32767 # col 3 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -100,7 +100,7 @@ mix_presentation_metadata { } element_mix_gain { param_definition { - parameter_id: 999 # Non-existent; default will be used + parameter_id: 999 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 @@ -110,14 +110,13 @@ mix_presentation_metadata { } output_mix_gain { param_definition { - parameter_id: 998 # Non-existent; default will be used + parameter_id: 998 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -129,7 +128,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2631 - digital_peak: 0 + digital_peak: 203 } } } @@ -140,8 +139,12 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000113_f.mp4 b/tests/test_000113_f.mp4 index afe22fea..6ba39ee8 100644 Binary files a/tests/test_000113_f.mp4 and b/tests/test_000113_f.mp4 differ diff --git a/tests/test_000113_s.mp4 b/tests/test_000113_s.mp4 index b830aeed..e35daa48 100644 Binary files a/tests/test_000113_s.mp4 and b/tests/test_000113_s.mp4 differ diff --git a/tests/test_000114.iamf b/tests/test_000114.iamf index 3d991b6e..ab92d58a 100644 Binary files a/tests/test_000114.iamf and b/tests/test_000114.iamf differ diff --git a/tests/test_000114.textproto b/tests/test_000114.textproto index 91a193f0..4b32aa0d 100644 --- a/tests/test_000114.textproto +++ b/tests/test_000114.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -33,7 +32,11 @@ test_vector_metadata { "7.5.2/Limiter" ] base_test: "test_000106" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -65,15 +68,14 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 9 - audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8 ] - num_parameters: 0 + audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8] ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 9 substream_count: 9 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, 0, 0, 0, 0, 0, # col 0 0, 32767, 0, 0, 0, 0, 0, 0, 0, # col 1 @@ -85,18 +87,16 @@ audio_element_metadata { 0, 0, 0, 0, 0, 0, 0, 32767, 0, # col 7 0, 0, 0, 0, 0, 0, 0, 0, 32767 # col 8 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -105,7 +105,7 @@ mix_presentation_metadata { } element_mix_gain { param_definition { - parameter_id: 999 # Non-existent; default will be used + parameter_id: 999 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 @@ -115,14 +115,13 @@ mix_presentation_metadata { } output_mix_gain { param_definition { - parameter_id: 998 # Non-existent; default will be used + parameter_id: 998 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -134,7 +133,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2853 - digital_peak: 0 + digital_peak: 14 } } } @@ -145,8 +144,17 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000114_f.mp4 b/tests/test_000114_f.mp4 index 3e7b96d0..7d399e14 100644 Binary files a/tests/test_000114_f.mp4 and b/tests/test_000114_f.mp4 differ diff --git a/tests/test_000114_s.mp4 b/tests/test_000114_s.mp4 index 94bbec8a..2f4b0d36 100644 Binary files a/tests/test_000114_s.mp4 and b/tests/test_000114_s.mp4 differ diff --git a/tests/test_000115.iamf b/tests/test_000115.iamf index 91961c80..53111865 100644 Binary files a/tests/test_000115.iamf and b/tests/test_000115.iamf differ diff --git a/tests/test_000115.textproto b/tests/test_000115.textproto index fa9a41c2..8bfc88e9 100644 --- a/tests/test_000115.textproto +++ b/tests/test_000115.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -33,7 +32,11 @@ test_vector_metadata { "7.5.2/Limiter" ] base_test: "test_000107" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -65,15 +68,14 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 16 substream_count: 16 coupled_substream_count: 0 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 0 0, 32767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # col 1 @@ -92,18 +94,16 @@ audio_element_metadata { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32767, 0, # col 14 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32767 # col 15 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -112,7 +112,7 @@ mix_presentation_metadata { } element_mix_gain { param_definition { - parameter_id: 999 # Non-existent; default will be used + parameter_id: 999 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 @@ -122,14 +122,13 @@ mix_presentation_metadata { } output_mix_gain { param_definition { - parameter_id: 998 # Non-existent; default will be used + parameter_id: 998 # Non-existent; default will be used parameter_rate: 48000 param_definition_mode: 1 reserved: 0 } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -141,7 +140,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -2834 - digital_peak: 0 + digital_peak: 55 } } } @@ -152,8 +151,24 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000115_f.mp4 b/tests/test_000115_f.mp4 index 248fe3c2..4bca2fb4 100644 Binary files a/tests/test_000115_f.mp4 and b/tests/test_000115_f.mp4 differ diff --git a/tests/test_000115_s.mp4 b/tests/test_000115_s.mp4 index 0e81b0be..7b9e9492 100644 Binary files a/tests/test_000115_s.mp4 and b/tests/test_000115_s.mp4 differ diff --git a/tests/test_000116.iamf b/tests/test_000116.iamf index fd17e4e2..f7540bb0 100644 Binary files a/tests/test_000116.iamf and b/tests/test_000116.iamf differ diff --git a/tests/test_000116.textproto b/tests/test_000116.textproto index b7571c6b..8766beb9 100644 --- a/tests/test_000116.textproto +++ b/tests/test_000116.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -37,7 +37,11 @@ test_vector_metadata { "6.2.2/roll" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -69,11 +73,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -90,12 +91,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -121,7 +119,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -144,15 +141,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { @@ -174,7 +172,7 @@ temporal_delimiter_metadata { arbitrary_obu_metadata { insertion_hook: INSERTION_HOOK_AFTER_IA_SEQUENCE_HEADER - obu_type: OBU_IA_RESERVED_24 + obu_type: OBU_IA_METADATA payload: "Imaginary descriptor OBU between the IA sequence header and codec config." } diff --git a/tests/test_000116_f.mp4 b/tests/test_000116_f.mp4 index 7d7ad8f7..17347c76 100644 Binary files a/tests/test_000116_f.mp4 and b/tests/test_000116_f.mp4 differ diff --git a/tests/test_000116_s.mp4 b/tests/test_000116_s.mp4 index 5831139c..d45d56fa 100644 Binary files a/tests/test_000116_s.mp4 and b/tests/test_000116_s.mp4 differ diff --git a/tests/test_000117.iamf b/tests/test_000117.iamf index 3164b3d0..27b25c24 100644 Binary files a/tests/test_000117.iamf and b/tests/test_000117.iamf differ diff --git a/tests/test_000117.textproto b/tests/test_000117.textproto index 58e9a542..4ca5915f 100644 --- a/tests/test_000117.textproto +++ b/tests/test_000117.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,7 +34,11 @@ test_vector_metadata { "6.2.2/roll" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -66,11 +70,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -85,19 +86,15 @@ audio_element_metadata { } obu_header { obu_extension_flag: true - extension_header_size: 5 extension_header_bytes: "extra" } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -123,7 +120,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -146,8 +142,10 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000117_f.mp4 b/tests/test_000117_f.mp4 index dd8f4a21..926846eb 100644 Binary files a/tests/test_000117_f.mp4 and b/tests/test_000117_f.mp4 differ diff --git a/tests/test_000117_s.mp4 b/tests/test_000117_s.mp4 index a0b27793..ecf00d05 100644 Binary files a/tests/test_000117_s.mp4 and b/tests/test_000117_s.mp4 differ diff --git a/tests/test_000118.iamf b/tests/test_000118.iamf index 7e16981f..a4fd1269 100644 Binary files a/tests/test_000118.iamf and b/tests/test_000118.iamf differ diff --git a/tests/test_000118.textproto b/tests/test_000118.textproto index 77713885..d5cde0c0 100644 --- a/tests/test_000118.textproto +++ b/tests/test_000118.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -37,7 +37,11 @@ test_vector_metadata { "8.5.1/Loudness Information" ] base_test: "test_000087" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -70,9 +74,7 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 2 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -82,7 +84,6 @@ audio_element_metadata: [ param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } default_demixing_info_parameter_data: { @@ -100,13 +101,11 @@ audio_element_metadata: [ param_definition_mode: 0 reserved: 0 duration: 960 - num_subblocks: 1 constant_subblock_duration: 960 } } } scalable_channel_layout_config { - num_layers: 2 reserved: 0 channel_audio_layer_configs: [ { @@ -133,11 +132,8 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [4] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -155,12 +151,9 @@ audio_element_metadata: [ mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres_with_two_audio_elements"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 2 audio_elements: [ { audio_element_id: 300 @@ -204,7 +197,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -238,12 +230,9 @@ mix_presentation_metadata { mix_presentation_metadata { mix_presentation_id: 43 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres_with_one_audio_element"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements: [ { audio_element_id: 301 @@ -271,7 +260,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -295,16 +283,24 @@ audio_frame_metadata: [ samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] }, { wav_filename: "dialog_clip_stereo.wav" samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 301 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } ] diff --git a/tests/test_000118_f.mp4 b/tests/test_000118_f.mp4 index ae03b916..64ec259c 100644 Binary files a/tests/test_000118_f.mp4 and b/tests/test_000118_f.mp4 differ diff --git a/tests/test_000118_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000118_rendered_id_42_sub_mix_0_layout_0.wav index 73cf5466..fd0b5a68 100644 Binary files a/tests/test_000118_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000118_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000118_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000118_rendered_id_42_sub_mix_0_layout_1.wav index e19d0f49..a2eeb6a5 100644 Binary files a/tests/test_000118_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000118_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000118_rendered_id_43_sub_mix_0_layout_0.wav b/tests/test_000118_rendered_id_43_sub_mix_0_layout_0.wav index 2d092e84..74cf445c 100644 Binary files a/tests/test_000118_rendered_id_43_sub_mix_0_layout_0.wav and b/tests/test_000118_rendered_id_43_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000118_s.mp4 b/tests/test_000118_s.mp4 index 02dcc699..16ff71e8 100644 Binary files a/tests/test_000118_s.mp4 and b/tests/test_000118_s.mp4 differ diff --git a/tests/test_000119.textproto b/tests/test_000119.textproto index df268c6a..1d68a744 100644 --- a/tests/test_000119.textproto +++ b/tests/test_000119.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000002" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,11 +65,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -81,12 +83,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -112,7 +111,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -135,8 +133,10 @@ audio_frame_metadata { samples_to_trim_at_end: 6 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } arbitrary_obu_metadata: [ diff --git a/tests/test_000120.textproto b/tests/test_000120.textproto index 2bcd37c7..46c1259f 100644 --- a/tests/test_000120.textproto +++ b/tests/test_000120.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000119" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,11 +65,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 0x22 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -81,12 +83,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -112,7 +111,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -135,8 +133,10 @@ audio_frame_metadata { samples_to_trim_at_end: 6 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } arbitrary_obu_metadata: [ diff --git a/tests/test_000121.iamf b/tests/test_000121.iamf index ccd9d14d..17ce5488 100644 Binary files a/tests/test_000121.iamf and b/tests/test_000121.iamf differ diff --git a/tests/test_000121.textproto b/tests/test_000121.textproto index 67389c02..977ec117 100644 --- a/tests/test_000121.textproto +++ b/tests/test_000121.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,6 +28,11 @@ test_vector_metadata { base_test: "test_000005" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -52,18 +57,15 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 1 audio_element_params: { - param_definition_type: PARAM_DEFINITION_TYPE_RESERVED_3 + param_definition_type: PARAM_DEFINITION_TYPE_RESERVED_255 param_definition_extension: { param_definition_size: 7 param_definition_bytes: "ignored" } } scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -80,12 +82,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -111,7 +110,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -134,8 +132,10 @@ audio_frame_metadata { samples_to_trim_at_end: 0 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000121_f.mp4 b/tests/test_000121_f.mp4 index c10f21ed..67d23f5b 100644 Binary files a/tests/test_000121_f.mp4 and b/tests/test_000121_f.mp4 differ diff --git a/tests/test_000121_s.mp4 b/tests/test_000121_s.mp4 index 12f6a645..1002c2fb 100644 Binary files a/tests/test_000121_s.mp4 and b/tests/test_000121_s.mp4 differ diff --git a/tests/test_000122.textproto b/tests/test_000122.textproto index 6ea8eca5..13b4c466 100644 --- a/tests/test_000122.textproto +++ b/tests/test_000122.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000119" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,11 +65,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 0x22 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -81,12 +83,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -112,7 +111,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -135,8 +133,10 @@ audio_frame_metadata { samples_to_trim_at_end: 6 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } arbitrary_obu_metadata: [ diff --git a/tests/test_000123.iamf b/tests/test_000123.iamf index ae6c0cbe..1d4d6bec 100644 Binary files a/tests/test_000123.iamf and b/tests/test_000123.iamf differ diff --git a/tests/test_000123.textproto b/tests/test_000123.textproto index cdae7cd8..f5beb850 100644 --- a/tests/test_000123.textproto +++ b/tests/test_000123.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -38,7 +38,11 @@ test_vector_metadata { "4.3/Cumulative channel limit" ] base_test: "test_000118" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -71,11 +75,8 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 7 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -94,9 +95,7 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 16 audio_substream_ids: [7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -110,12 +109,9 @@ audio_element_metadata: [ mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres_0_with_twenty_eight_channels"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 2 audio_elements: [ { audio_element_id: 300 @@ -159,7 +155,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -171,7 +166,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -3519 - digital_peak: 0 + digital_peak: 215 } } layouts { @@ -184,8 +179,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4937 - digital_peak: -1771 + integrated_loudness: -3904 + digital_peak: -1700 } } } @@ -193,12 +188,9 @@ mix_presentation_metadata { mix_presentation_metadata { mix_presentation_id: 43 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres_with_sixteen_channels"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements: [ { audio_element_id: 301 @@ -226,7 +218,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -251,8 +242,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -5656 - digital_peak: -3293 + integrated_loudness: -4428 + digital_peak: -1719 } } } @@ -264,16 +255,44 @@ audio_frame_metadata: [ samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] }, { wav_filename: "Transport_TOA_5s.wav" samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 301 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - channel_labels: ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 } + ] } ] diff --git a/tests/test_000123_f.mp4 b/tests/test_000123_f.mp4 index 22f20b0d..43e3384d 100644 Binary files a/tests/test_000123_f.mp4 and b/tests/test_000123_f.mp4 differ diff --git a/tests/test_000123_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000123_rendered_id_42_sub_mix_0_layout_0.wav index 567d6e21..e8c61ded 100644 Binary files a/tests/test_000123_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000123_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000123_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000123_rendered_id_42_sub_mix_0_layout_1.wav index 889bf43f..de191909 100644 Binary files a/tests/test_000123_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000123_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000123_rendered_id_43_sub_mix_0_layout_0.wav b/tests/test_000123_rendered_id_43_sub_mix_0_layout_0.wav index 977ab360..f19bc219 100644 Binary files a/tests/test_000123_rendered_id_43_sub_mix_0_layout_0.wav and b/tests/test_000123_rendered_id_43_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000123_rendered_id_43_sub_mix_0_layout_1.wav b/tests/test_000123_rendered_id_43_sub_mix_0_layout_1.wav index c4bfc557..62b462bf 100644 Binary files a/tests/test_000123_rendered_id_43_sub_mix_0_layout_1.wav and b/tests/test_000123_rendered_id_43_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000123_s.mp4 b/tests/test_000123_s.mp4 index 882835a2..ef460ffd 100644 Binary files a/tests/test_000123_s.mp4 and b/tests/test_000123_s.mp4 differ diff --git a/tests/test_000124.textproto b/tests/test_000124.textproto index e8d7616d..979851bf 100644 --- a/tests/test_000124.textproto +++ b/tests/test_000124.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -28,7 +28,11 @@ test_vector_metadata { "3.7/num_sub_mixes" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -60,11 +64,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -84,11 +85,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [1] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -105,12 +103,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 2 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -136,7 +131,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -153,7 +147,6 @@ mix_presentation_metadata { } } sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 301 localized_element_annotations: ["test_sub_mix_1_audio_element_0"] @@ -179,7 +172,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -202,8 +194,10 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } audio_frame_metadata { @@ -211,8 +205,10 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 301 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000125.textproto b/tests/test_000125.textproto index 18c455fd..d9fa15a6 100644 --- a/tests/test_000125.textproto +++ b/tests/test_000125.textproto @@ -8,13 +8,14 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { human_readable_description: - "An invalid IAMF stream because it is simple profile and contains a Mix " - "Presentation with a reserved headphones rendering mode." + "An invalid IAMF stream because it contains a single Mix Presentation with " + "HEADPHONES_RENDERING_MODE_BINAURAL_HEAD_LOCKED, which is not allowed in " + "Simple profile." file_name_prefix: "test_000125" is_valid: false is_valid_to_decode: false @@ -28,7 +29,11 @@ test_vector_metadata { "3.7.3/headphones_rendering_mode" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -60,11 +65,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -81,17 +83,14 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] rendering_config { - headphones_rendering_mode: HEADPHONES_RENDERING_MODE_RESERVED_2 + headphones_rendering_mode: HEADPHONES_RENDERING_MODE_BINAURAL_HEAD_LOCKED } element_mix_gain { param_definition { @@ -112,7 +111,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -135,15 +133,16 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000126.iamf b/tests/test_000126.iamf index 853994da..f33d92c2 100644 Binary files a/tests/test_000126.iamf and b/tests/test_000126.iamf differ diff --git a/tests/test_000126.textproto b/tests/test_000126.textproto index bd06552a..c432c64d 100644 --- a/tests/test_000126.textproto +++ b/tests/test_000126.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -33,7 +33,11 @@ test_vector_metadata { "6.2.2/roll" ] base_test: "test_000020" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -65,11 +69,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -86,12 +87,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -117,7 +115,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -153,8 +150,10 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000126_f.mp4 b/tests/test_000126_f.mp4 index 9cd5db8b..dc73c1f3 100644 Binary files a/tests/test_000126_f.mp4 and b/tests/test_000126_f.mp4 differ diff --git a/tests/test_000126_s.mp4 b/tests/test_000126_s.mp4 index 27dc0df5..3009d344 100644 Binary files a/tests/test_000126_s.mp4 and b/tests/test_000126_s.mp4 differ diff --git a/tests/test_000127.textproto b/tests/test_000127.textproto index b899cda1..10dbef6a 100644 --- a/tests/test_000127.textproto +++ b/tests/test_000127.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -34,7 +34,11 @@ test_vector_metadata { "8.5.1/Loudness Information" ] base_test: "test_000303" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -67,9 +71,7 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -84,11 +86,8 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [4] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -106,12 +105,9 @@ audio_element_metadata: [ mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 2 audio_elements: [ { audio_element_id: 300 @@ -155,7 +151,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -179,16 +174,22 @@ audio_frame_metadata: [ samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] }, { wav_filename: "dialog_clip_stereo.wav" samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 301 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } ] diff --git a/tests/test_000128.textproto b/tests/test_000128.textproto index bccedb9f..d54d04fa 100644 --- a/tests/test_000128.textproto +++ b/tests/test_000128.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -35,7 +35,11 @@ test_vector_metadata { "8.5.1/Loudness Information" ] base_test: "test_000303" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -68,9 +72,7 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -85,11 +87,8 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [4] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -108,11 +107,8 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [5] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -130,12 +126,9 @@ audio_element_metadata: [ mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 3 audio_elements: [ { audio_element_id: 300 @@ -195,7 +188,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -219,24 +211,32 @@ audio_frame_metadata: [ samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] }, { wav_filename: "dialog_clip_stereo.wav" samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 301 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] }, { wav_filename: "dialog_clip_stereo.wav" samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 302 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } ] diff --git a/tests/test_000129.textproto b/tests/test_000129.textproto index 50af7a03..292417d3 100644 --- a/tests/test_000129.textproto +++ b/tests/test_000129.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000119" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,11 +65,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 0x22 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -81,12 +83,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -112,7 +111,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -135,8 +133,10 @@ audio_frame_metadata { samples_to_trim_at_end: 6 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } arbitrary_obu_metadata: [ diff --git a/tests/test_000130.textproto b/tests/test_000130.textproto index e30540cb..95a63da6 100644 --- a/tests/test_000130.textproto +++ b/tests/test_000130.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -36,6 +36,11 @@ test_vector_metadata { base_test: "test_000120" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -60,11 +65,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 0x22 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -81,12 +83,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -112,7 +111,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -135,8 +133,10 @@ audio_frame_metadata { samples_to_trim_at_end: 6 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } arbitrary_obu_metadata: [ diff --git a/tests/test_000131.iamf b/tests/test_000131.iamf index 1c6aadc1..e66d5a34 100644 Binary files a/tests/test_000131.iamf and b/tests/test_000131.iamf differ diff --git a/tests/test_000131.textproto b/tests/test_000131.textproto index 16573f26..2d9c07d5 100644 --- a/tests/test_000131.textproto +++ b/tests/test_000131.textproto @@ -8,9 +8,8 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata -# txtpbfmt: disable test_vector_metadata { human_readable_description: @@ -19,7 +18,7 @@ test_vector_metadata { file_name_prefix: "test_000131" is_valid: true is_valid_to_decode: true -validate_user_loudness: true + validate_user_loudness: true mp4_fixed_timestamp: "2024-07-09 00:00:00" test_repository_tags: [ "github/aomediacodec/libiamf/main", @@ -32,7 +31,11 @@ validate_user_loudness: true "7.3.2.2/Rendering a Scene-Based Audio Element to Loudspeakers" ] base_test: "test_000048" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -64,33 +67,30 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 2 audio_substream_ids: [0, 1] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_PROJECTION ambisonics_projection_config { output_channel_count: 4 substream_count: 2 coupled_substream_count: 2 +# txtpbfmt: off demixing_matrix: [ 32767, 0, 0, 0, # col 0 0, 32767, 0, 0, # col 1 0, 0, 32767, 0, # col 2 0, 0, 0, 32767 # col 3 ] +# txtpbfmt: on } } } mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -116,7 +116,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -141,7 +140,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -3176 + integrated_loudness: -2932 digital_peak: -2928 } } @@ -153,15 +152,18 @@ audio_frame_metadata { samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3] - channel_labels: ["A0", "A1", "A2", "A3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 } + ] } parameter_block_metadata { parameter_id: 100 start_timestamp: 0 duration: 24960 - num_subblocks: 1 constant_subblock_duration: 24960 subblocks: [ { diff --git a/tests/test_000131_f.mp4 b/tests/test_000131_f.mp4 index a96ceba1..fa05d79a 100644 Binary files a/tests/test_000131_f.mp4 and b/tests/test_000131_f.mp4 differ diff --git a/tests/test_000131_s.mp4 b/tests/test_000131_s.mp4 index 01cbf601..b92dd66d 100644 Binary files a/tests/test_000131_s.mp4 and b/tests/test_000131_s.mp4 differ diff --git a/tests/test_000132.iamf b/tests/test_000132.iamf index 891e6702..b5ad1c79 100644 Binary files a/tests/test_000132.iamf and b/tests/test_000132.iamf differ diff --git a/tests/test_000132.textproto b/tests/test_000132.textproto index 8bcef4ee..722e7016 100644 --- a/tests/test_000132.textproto +++ b/tests/test_000132.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -38,7 +38,11 @@ test_vector_metadata { "4.3/Cumulative channel limit" ] base_test: "test_000118" - output_wav_file_bit_depth_override: 16 +} + +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_SIXTEEN } ia_sequence_header_metadata { @@ -71,9 +75,7 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_SCENE_BASED reserved: 0 codec_config_id: 200 - num_substreams: 25 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] - num_parameters: 0 ambisonics_config { ambisonics_mode: AMBISONICS_MODE_MONO ambisonics_mono_config { @@ -88,11 +90,8 @@ audio_element_metadata: [ audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [25] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -110,12 +109,9 @@ audio_element_metadata: [ mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres_0_with_twenty_seven_channels"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 2 audio_elements: [ { audio_element_id: 300 @@ -159,7 +155,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -184,7 +179,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -5997 + integrated_loudness: -4686 digital_peak: -2458 } } @@ -193,12 +188,9 @@ mix_presentation_metadata { mix_presentation_metadata { mix_presentation_id: 43 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres_with_two_channels"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements: [ { audio_element_id: 301 @@ -226,7 +218,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -250,33 +241,32 @@ audio_frame_metadata: [ samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] - channel_labels: [ - "A0", - "A1", - "A2", - "A3", - "A4", - "A5", - "A6", - "A7", - "A8", - "A9", - "A10", - "A11", - "A12", - "A13", - "A14", - "A15", - "A16", - "A17", - "A18", - "A19", - "A20", - "A21", - "A22", - "A23", - "A24" + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_A_0 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_A_1 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_A_2 }, + { channel_id: 3 channel_label: CHANNEL_LABEL_A_3 }, + { channel_id: 4 channel_label: CHANNEL_LABEL_A_4 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_A_5 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_A_6 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_A_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_A_8 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_A_9 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_A_10 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_A_11 }, + { channel_id: 12 channel_label: CHANNEL_LABEL_A_12 }, + { channel_id: 13 channel_label: CHANNEL_LABEL_A_13 }, + { channel_id: 14 channel_label: CHANNEL_LABEL_A_14 }, + { channel_id: 15 channel_label: CHANNEL_LABEL_A_15 }, + { channel_id: 16 channel_label: CHANNEL_LABEL_A_16 }, + { channel_id: 17 channel_label: CHANNEL_LABEL_A_17 }, + { channel_id: 18 channel_label: CHANNEL_LABEL_A_18 }, + { channel_id: 19 channel_label: CHANNEL_LABEL_A_19 }, + { channel_id: 20 channel_label: CHANNEL_LABEL_A_20 }, + { channel_id: 21 channel_label: CHANNEL_LABEL_A_21 }, + { channel_id: 22 channel_label: CHANNEL_LABEL_A_22 }, + { channel_id: 23 channel_label: CHANNEL_LABEL_A_23 }, + { channel_id: 24 channel_label: CHANNEL_LABEL_A_24 } ] }, { @@ -284,8 +274,10 @@ audio_frame_metadata: [ samples_to_trim_at_end: 648 samples_to_trim_at_start: 312 audio_element_id: 301 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } ] diff --git a/tests/test_000132_f.mp4 b/tests/test_000132_f.mp4 index 1b9c71cb..f839e6e0 100644 Binary files a/tests/test_000132_f.mp4 and b/tests/test_000132_f.mp4 differ diff --git a/tests/test_000132_rendered_id_42_sub_mix_0_layout_0.wav b/tests/test_000132_rendered_id_42_sub_mix_0_layout_0.wav index ef35a979..98dd03e1 100644 Binary files a/tests/test_000132_rendered_id_42_sub_mix_0_layout_0.wav and b/tests/test_000132_rendered_id_42_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000132_rendered_id_42_sub_mix_0_layout_1.wav b/tests/test_000132_rendered_id_42_sub_mix_0_layout_1.wav index eff79d43..c9d2681d 100644 Binary files a/tests/test_000132_rendered_id_42_sub_mix_0_layout_1.wav and b/tests/test_000132_rendered_id_42_sub_mix_0_layout_1.wav differ diff --git a/tests/test_000132_rendered_id_43_sub_mix_0_layout_0.wav b/tests/test_000132_rendered_id_43_sub_mix_0_layout_0.wav index 2d092e84..74cf445c 100644 Binary files a/tests/test_000132_rendered_id_43_sub_mix_0_layout_0.wav and b/tests/test_000132_rendered_id_43_sub_mix_0_layout_0.wav differ diff --git a/tests/test_000132_s.mp4 b/tests/test_000132_s.mp4 index aa78fc0a..f093e78d 100644 Binary files a/tests/test_000132_s.mp4 and b/tests/test_000132_s.mp4 differ diff --git a/tests/test_000200.textproto b/tests/test_000200.textproto index 70c08651..eb487c29 100644 --- a/tests/test_000200.textproto +++ b/tests/test_000200.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000003" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -143,8 +141,9 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [2] # Centre - channel_labels: ["M"] + channel_metadatas: [ + { channel_id: 2 channel_label: CHANNEL_LABEL_MONO } # Centre in the original file. + ] } temporal_delimiter_metadata { diff --git a/tests/test_000200_f.mp4 b/tests/test_000200_f.mp4 index 4cf98166..bc396b9f 100644 Binary files a/tests/test_000200_f.mp4 and b/tests/test_000200_f.mp4 differ diff --git a/tests/test_000201.textproto b/tests/test_000201.textproto index 90d82aab..edb7440e 100644 --- a/tests/test_000201.textproto +++ b/tests/test_000201.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000003" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 1 audio_substream_ids: [0] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 1 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -129,8 +127,10 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1] - channel_labels: ["L2", "R2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000201_f.mp4 b/tests/test_000201_f.mp4 index 33440cda..cc5d7956 100644 Binary files a/tests/test_000201_f.mp4 and b/tests/test_000201_f.mp4 differ diff --git a/tests/test_000202.iamf b/tests/test_000202.iamf index 069259c8..f96a0fe5 100644 Binary files a/tests/test_000202.iamf and b/tests/test_000202.iamf differ diff --git a/tests/test_000202.textproto b/tests/test_000202.textproto index 82054f95..95a76420 100644 --- a/tests/test_000202.textproto +++ b/tests/test_000202.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000201" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -131,7 +129,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4717 + integrated_loudness: -4794 digital_peak: -998 } } @@ -143,8 +141,14 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 8, 9] - channel_labels: ["L3", "R3", "C", "LFE", "Ltf3", "Rtf3"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_3 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_3 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_3 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_3 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000202_f.mp4 b/tests/test_000202_f.mp4 index 8e7f2464..658b1b92 100644 Binary files a/tests/test_000202_f.mp4 and b/tests/test_000202_f.mp4 differ diff --git a/tests/test_000202_s.mp4 b/tests/test_000202_s.mp4 index 6b5494a4..5a5b5455 100644 Binary files a/tests/test_000202_s.mp4 and b/tests/test_000202_s.mp4 differ diff --git a/tests/test_000203.iamf b/tests/test_000203.iamf index 02df0e3b..3f91a4ed 100644 Binary files a/tests/test_000203.iamf and b/tests/test_000203.iamf differ diff --git a/tests/test_000203.textproto b/tests/test_000203.textproto index 71e515cb..5b682c7d 100644 --- a/tests/test_000203.textproto +++ b/tests/test_000203.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000202" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 4 audio_substream_ids: [0, 1, 2, 3] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -118,7 +116,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -4618 - digital_peak: -629 + digital_peak: -630 } } layouts { @@ -131,7 +129,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 + integrated_loudness: -4637 digital_peak: -1009 } } @@ -143,8 +141,14 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000203_f.mp4 b/tests/test_000203_f.mp4 index 61518467..c5c96154 100644 Binary files a/tests/test_000203_f.mp4 and b/tests/test_000203_f.mp4 differ diff --git a/tests/test_000203_s.mp4 b/tests/test_000203_s.mp4 index e3013a29..df1f183c 100644 Binary files a/tests/test_000203_s.mp4 and b/tests/test_000203_s.mp4 differ diff --git a/tests/test_000204.iamf b/tests/test_000204.iamf index 26da2480..88ac0559 100644 Binary files a/tests/test_000204.iamf and b/tests/test_000204.iamf differ diff --git a/tests/test_000204.textproto b/tests/test_000204.textproto index f1447d11..6f9f7907 100644 --- a/tests/test_000204.textproto +++ b/tests/test_000204.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000203" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 5 audio_substream_ids: [0, 1, 2, 3, 4] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -131,8 +129,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4559 + digital_peak: -998 } } } @@ -143,8 +141,17 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 8, 9] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5", "Ltf2", "Rtf2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_2 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_2 } + ] + } temporal_delimiter_metadata { diff --git a/tests/test_000204_f.mp4 b/tests/test_000204_f.mp4 index 18b0f00b..3055e455 100644 Binary files a/tests/test_000204_f.mp4 and b/tests/test_000204_f.mp4 differ diff --git a/tests/test_000204_s.mp4 b/tests/test_000204_s.mp4 index 130afdee..c7953862 100644 Binary files a/tests/test_000204_s.mp4 and b/tests/test_000204_s.mp4 differ diff --git a/tests/test_000205.iamf b/tests/test_000205.iamf index 7981ecc4..aa804764 100644 Binary files a/tests/test_000205.iamf and b/tests/test_000205.iamf differ diff --git a/tests/test_000205.textproto b/tests/test_000205.textproto index 16f62949..41f77997 100644 --- a/tests/test_000205.textproto +++ b/tests/test_000205.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000204" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -56,11 +61,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 6 audio_substream_ids: [0, 1, 2, 3, 4, 5] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -77,12 +79,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -108,7 +107,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -120,7 +118,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -4244 - digital_peak: 0 + digital_peak: 123 } } layouts { @@ -133,8 +131,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4326 + digital_peak: -998 } } } @@ -145,8 +143,18 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 8, 9, 10, 11] - channel_labels: ["L5", "R5", "C", "LFE", "Ls5", "Rs5", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_5 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_5 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LS_5 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RS_5 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000205_f.mp4 b/tests/test_000205_f.mp4 index 4ca4e3cf..d9329923 100644 Binary files a/tests/test_000205_f.mp4 and b/tests/test_000205_f.mp4 differ diff --git a/tests/test_000205_s.mp4 b/tests/test_000205_s.mp4 index 601d1aef..ee0f14c2 100644 Binary files a/tests/test_000205_s.mp4 and b/tests/test_000205_s.mp4 differ diff --git a/tests/test_000206.iamf b/tests/test_000206.iamf index 7fbd64c0..a835ef23 100644 Binary files a/tests/test_000206.iamf and b/tests/test_000206.iamf differ diff --git a/tests/test_000206.textproto b/tests/test_000206.textproto index 042ba260..3ffbf79c 100644 --- a/tests/test_000206.textproto +++ b/tests/test_000206.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000205" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 5 audio_substream_ids: [0, 1, 2, 3, 4] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -117,7 +115,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4413 + integrated_loudness: -4414 digital_peak: -333 } } @@ -131,7 +129,7 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 + integrated_loudness: -4433 digital_peak: -1009 } } @@ -143,8 +141,17 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 } + ] + } temporal_delimiter_metadata { diff --git a/tests/test_000206_f.mp4 b/tests/test_000206_f.mp4 index 383c0577..3f4a7bcb 100644 Binary files a/tests/test_000206_f.mp4 and b/tests/test_000206_f.mp4 differ diff --git a/tests/test_000206_s.mp4 b/tests/test_000206_s.mp4 index 5256c2ad..39934084 100644 Binary files a/tests/test_000206_s.mp4 and b/tests/test_000206_s.mp4 differ diff --git a/tests/test_000207.iamf b/tests/test_000207.iamf index c7cc77d1..a64b202d 100644 Binary files a/tests/test_000207.iamf and b/tests/test_000207.iamf differ diff --git a/tests/test_000207.textproto b/tests/test_000207.textproto index b730b0a3..7234aea9 100644 --- a/tests/test_000207.textproto +++ b/tests/test_000207.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -30,6 +30,11 @@ test_vector_metadata { base_test: "test_000206" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -54,11 +59,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 6 audio_substream_ids: [0, 1, 2, 3, 4, 5] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -75,12 +77,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -106,7 +105,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -118,7 +116,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -4246 - digital_peak: -338 + digital_peak: -339 } } layouts { @@ -131,8 +129,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4301 + digital_peak: -998 } } } @@ -143,8 +141,19 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf2", "Rtf2"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_2 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_2 } + ] + } temporal_delimiter_metadata { diff --git a/tests/test_000207_f.mp4 b/tests/test_000207_f.mp4 index 126b5f79..cd6e64bb 100644 Binary files a/tests/test_000207_f.mp4 and b/tests/test_000207_f.mp4 differ diff --git a/tests/test_000207_s.mp4 b/tests/test_000207_s.mp4 index eafd42d1..17fbd819 100644 Binary files a/tests/test_000207_s.mp4 and b/tests/test_000207_s.mp4 differ diff --git a/tests/test_000208.iamf b/tests/test_000208.iamf index 8040b666..312ad109 100644 Binary files a/tests/test_000208.iamf and b/tests/test_000208.iamf differ diff --git a/tests/test_000208.textproto b/tests/test_000208.textproto index a3281d91..dadb21d1 100644 --- a/tests/test_000208.textproto +++ b/tests/test_000208.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -32,6 +32,11 @@ test_vector_metadata { base_test: "test_000207" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -56,11 +61,8 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 7 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6] - num_parameters: 0 scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -77,12 +79,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -108,7 +107,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 2 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -120,7 +118,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -4013 - digital_peak: 0 + digital_peak: 198 } } layouts { @@ -133,8 +131,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4112 + digital_peak: -998 } } } @@ -145,8 +143,20 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } temporal_delimiter_metadata { diff --git a/tests/test_000208_f.mp4 b/tests/test_000208_f.mp4 index 7090206b..1fe0cff0 100644 Binary files a/tests/test_000208_f.mp4 and b/tests/test_000208_f.mp4 differ diff --git a/tests/test_000208_s.mp4 b/tests/test_000208_s.mp4 index 0ec05443..59d79fa6 100644 Binary files a/tests/test_000208_s.mp4 and b/tests/test_000208_s.mp4 differ diff --git a/tests/test_000209.iamf b/tests/test_000209.iamf index 7a234970..7b97c1e6 100644 Binary files a/tests/test_000209.iamf and b/tests/test_000209.iamf differ diff --git a/tests/test_000209.textproto b/tests/test_000209.textproto index ab219087..9c988f88 100644 --- a/tests/test_000209.textproto +++ b/tests/test_000209.textproto @@ -8,7 +8,7 @@ # source code in the PATENTS file, you can obtain it at # www.aomedia.org/license/patent. -# proto-file: third_party/iamf_tools/iamf/cli/proto/user_metadata.proto +# proto-file: iamf/cli/proto/user_metadata.proto # proto-message: UserMetadata test_vector_metadata { @@ -37,6 +37,11 @@ test_vector_metadata { base_test: "test_000208" } +encoder_control_metadata { + add_build_information_tag: false + output_rendered_file_format: OUTPUT_FORMAT_WAV_BIT_DEPTH_AUTOMATIC +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -61,9 +66,7 @@ audio_element_metadata { audio_element_type: AUDIO_ELEMENT_CHANNEL_BASED reserved: 0 codec_config_id: 200 - num_substreams: 7 audio_substream_ids: [0, 1, 2, 3, 4, 5, 6] - num_parameters: 1 audio_element_params { param_definition_type: PARAM_DEFINITION_TYPE_DEMIXING demixing_param: { @@ -73,7 +76,6 @@ audio_element_metadata { param_definition_mode: 0 reserved: 0 duration: 1024 - num_subblocks: 1 constant_subblock_duration: 1024 } default_demixing_info_parameter_data: { @@ -83,7 +85,6 @@ audio_element_metadata { } } scalable_channel_layout_config { - num_layers: 1 reserved: 0 channel_audio_layer_configs: [ { @@ -100,12 +101,9 @@ audio_element_metadata { mix_presentation_metadata { mix_presentation_id: 42 - count_label: 1 annotations_language: ["en-us"] localized_presentation_annotations: ["test_mix_pres"] - num_sub_mixes: 1 sub_mixes { - num_audio_elements: 1 audio_elements { audio_element_id: 300 localized_element_annotations: ["test_sub_mix_0_audio_element_0"] @@ -131,7 +129,6 @@ mix_presentation_metadata { } default_mix_gain: 0 } - num_layouts: 4 layouts { loudness_layout { layout_type: LAYOUT_TYPE_LOUDSPEAKERS_SS_CONVENTION @@ -143,7 +140,7 @@ mix_presentation_metadata { loudness { info_type_bit_masks: [] integrated_loudness: -4013 - digital_peak: 0 + digital_peak: 198 } } layouts { @@ -170,8 +167,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4157 - digital_peak: 0 + integrated_loudness: -4290 + digital_peak: 98 } } layouts { @@ -184,8 +181,8 @@ mix_presentation_metadata { } loudness { info_type_bit_masks: [] - integrated_loudness: -4636 - digital_peak: -1009 + integrated_loudness: -4112 + digital_peak: -998 } } } @@ -196,8 +193,20 @@ audio_frame_metadata { samples_to_trim_at_end: 640 samples_to_trim_at_start: 0 audio_element_id: 300 - channel_ids: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - channel_labels: ["L7", "R7", "C", "LFE", "Lss7", "Rss7", "Lrs7", "Rrs7", "Ltf4", "Rtf4", "Ltb4", "Rtb4"] + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_7 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_7 }, + { channel_id: 2 channel_label: CHANNEL_LABEL_CENTRE }, + { channel_id: 3 channel_label: CHANNEL_LABEL_LFE }, + { channel_id: 4 channel_label: CHANNEL_LABEL_LSS_7 }, + { channel_id: 5 channel_label: CHANNEL_LABEL_RSS_7 }, + { channel_id: 6 channel_label: CHANNEL_LABEL_LRS_7 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RRS_7 }, + { channel_id: 8 channel_label: CHANNEL_LABEL_LTF_4 }, + { channel_id: 9 channel_label: CHANNEL_LABEL_RTF_4 }, + { channel_id: 10 channel_label: CHANNEL_LABEL_LTB_4 }, + { channel_id: 11 channel_label: CHANNEL_LABEL_RTB_4 } + ] } tempor{"code":"deadline_exceeded","msg":"operation timed out"}