diff --git a/iamf/cli/textproto_templates/1OA_and_stereo_opus.textproto b/iamf/cli/textproto_templates/1OA_and_stereo_opus.textproto index 5c93f29..2f41018 100644 --- a/iamf/cli/textproto_templates/1OA_and_stereo_opus.textproto +++ b/iamf/cli/textproto_templates/1OA_and_stereo_opus.textproto @@ -17,6 +17,35 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata: [ + { + wav_filename: "TEMPLATE_FOA.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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: "TEMPLATE_stereo.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 301 + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] + } +] + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_BASE additional_profile: PROFILE_VERSION_BASE @@ -149,35 +178,6 @@ mix_presentation_metadata { } } -audio_frame_metadata: [ - { - wav_filename: "TEMPLATE_FOA.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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: "TEMPLATE_stereo.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 301 - channel_metadatas: [ - { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, - { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } - ] - } -] - temporal_delimiter_metadata { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/1OA_and_stereo_pcm24bit.textproto b/iamf/cli/textproto_templates/1OA_and_stereo_pcm24bit.textproto index 655e6b1..0a320f2 100644 --- a/iamf/cli/textproto_templates/1OA_and_stereo_pcm24bit.textproto +++ b/iamf/cli/textproto_templates/1OA_and_stereo_pcm24bit.textproto @@ -17,6 +17,35 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata: [ + { + wav_filename: "TEMPLATE_FOA.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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: "TEMPLATE_stereo.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 301 + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] + } +] + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_BASE additional_profile: PROFILE_VERSION_BASE @@ -145,35 +174,6 @@ mix_presentation_metadata { } } -audio_frame_metadata: [ - { - wav_filename: "TEMPLATE_FOA.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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: "TEMPLATE_stereo.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 301 - channel_metadatas: [ - { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, - { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } - ] - } -] - temporal_delimiter_metadata { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/1OA_opus.textproto b/iamf/cli/textproto_templates/1OA_opus.textproto index 8a192fe..8d037ce 100644 --- a/iamf/cli/textproto_templates/1OA_opus.textproto +++ b/iamf/cli/textproto_templates/1OA_opus.textproto @@ -17,6 +17,21 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_FOA.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -106,21 +121,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_FOA.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/1OA_pcm24bit.textproto b/iamf/cli/textproto_templates/1OA_pcm24bit.textproto index 11c7f9c..d966364 100644 --- a/iamf/cli/textproto_templates/1OA_pcm24bit.textproto +++ b/iamf/cli/textproto_templates/1OA_pcm24bit.textproto @@ -17,6 +17,21 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_FOA.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -102,21 +117,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_FOA.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/3OA_and_stereo_opus.textproto b/iamf/cli/textproto_templates/3OA_and_stereo_opus.textproto index cfb5db2..c58b053 100644 --- a/iamf/cli/textproto_templates/3OA_and_stereo_opus.textproto +++ b/iamf/cli/textproto_templates/3OA_and_stereo_opus.textproto @@ -17,6 +17,47 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata: [ + { + wav_filename: "TEMPLATE_TOA.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] + }, + { + wav_filename: "TEMPLATE_stereo.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 301 + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] + } +] + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_BASE additional_profile: PROFILE_VERSION_BASE @@ -173,47 +214,6 @@ mix_presentation_metadata { } } -audio_frame_metadata: [ - { - wav_filename: "TEMPLATE_TOA.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 } - ] - }, - { - wav_filename: "TEMPLATE_stereo.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 301 - channel_metadatas: [ - { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, - { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } - ] - } -] - temporal_delimiter_metadata { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/3OA_and_stereo_pcm24bit.textproto b/iamf/cli/textproto_templates/3OA_and_stereo_pcm24bit.textproto index 07627a5..a1c4bb0 100644 --- a/iamf/cli/textproto_templates/3OA_and_stereo_pcm24bit.textproto +++ b/iamf/cli/textproto_templates/3OA_and_stereo_pcm24bit.textproto @@ -17,6 +17,47 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata: [ + { + wav_filename: "TEMPLATE_TOA.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] + }, + { + wav_filename: "TEMPLATE_stereo.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 301 + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] + } +] + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_BASE additional_profile: PROFILE_VERSION_BASE @@ -169,47 +210,6 @@ mix_presentation_metadata { } } -audio_frame_metadata: [ - { - wav_filename: "TEMPLATE_TOA.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 } - ] - }, - { - wav_filename: "TEMPLATE_stereo.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 301 - channel_metadatas: [ - { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, - { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } - ] - } -] - temporal_delimiter_metadata { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/3OA_opus.textproto b/iamf/cli/textproto_templates/3OA_opus.textproto index a7a0b8d..ebb9e7d 100644 --- a/iamf/cli/textproto_templates/3OA_opus.textproto +++ b/iamf/cli/textproto_templates/3OA_opus.textproto @@ -17,6 +17,33 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_TOA.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -130,33 +157,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_TOA.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/3OA_pcm24bit.textproto b/iamf/cli/textproto_templates/3OA_pcm24bit.textproto index b6271ea..8d1b7f5 100644 --- a/iamf/cli/textproto_templates/3OA_pcm24bit.textproto +++ b/iamf/cli/textproto_templates/3OA_pcm24bit.textproto @@ -17,6 +17,33 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_TOA.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -126,33 +153,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_TOA.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/5dot1_opus.textproto b/iamf/cli/textproto_templates/5dot1_opus.textproto index f12c78e..3417096 100644 --- a/iamf/cli/textproto_templates/5dot1_opus.textproto +++ b/iamf/cli/textproto_templates/5dot1_opus.textproto @@ -17,6 +17,23 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_5dot1.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -124,23 +141,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_5dot1.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/5dot1_pcm24bit.textproto b/iamf/cli/textproto_templates/5dot1_pcm24bit.textproto index ac4aa93..4ed5781 100644 --- a/iamf/cli/textproto_templates/5dot1_pcm24bit.textproto +++ b/iamf/cli/textproto_templates/5dot1_pcm24bit.textproto @@ -17,6 +17,23 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_5dot1.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -120,23 +137,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_5dot1.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/5dot1dot2_opus.textproto b/iamf/cli/textproto_templates/5dot1dot2_opus.textproto index 0db54d7..d0848c5 100644 --- a/iamf/cli/textproto_templates/5dot1dot2_opus.textproto +++ b/iamf/cli/textproto_templates/5dot1dot2_opus.textproto @@ -17,6 +17,25 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_5dot1dot2.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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: 6 channel_label: CHANNEL_LABEL_LTF_2 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RTF_2 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -124,25 +143,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_5dot1dot2.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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: 6 channel_label: CHANNEL_LABEL_LTF_2 }, - { channel_id: 7 channel_label: CHANNEL_LABEL_RTF_2 } - ] -} - temporal_delimiter_metadata { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/5dot1dot2_pcm24bit.textproto b/iamf/cli/textproto_templates/5dot1dot2_pcm24bit.textproto index f2688bd..c5d5993 100644 --- a/iamf/cli/textproto_templates/5dot1dot2_pcm24bit.textproto +++ b/iamf/cli/textproto_templates/5dot1dot2_pcm24bit.textproto @@ -17,6 +17,25 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_5dot1dot2.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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: 6 channel_label: CHANNEL_LABEL_LTF_2 }, + { channel_id: 7 channel_label: CHANNEL_LABEL_RTF_2 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -120,25 +139,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_5dot1dot2.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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: 6 channel_label: CHANNEL_LABEL_LTF_2 }, - { channel_id: 7 channel_label: CHANNEL_LABEL_RTF_2 } - ] -} - temporal_delimiter_metadata { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/7dot1dot4_opus.textproto b/iamf/cli/textproto_templates/7dot1dot4_opus.textproto index d3a9e44..d9af880 100644 --- a/iamf/cli/textproto_templates/7dot1dot4_opus.textproto +++ b/iamf/cli/textproto_templates/7dot1dot4_opus.textproto @@ -17,6 +17,29 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_7dot1dot4.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -124,29 +147,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_7dot1dot4.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/7dot1dot4_pcm24bit.textproto b/iamf/cli/textproto_templates/7dot1dot4_pcm24bit.textproto index 651b330..4816caf 100644 --- a/iamf/cli/textproto_templates/7dot1dot4_pcm24bit.textproto +++ b/iamf/cli/textproto_templates/7dot1dot4_pcm24bit.textproto @@ -17,6 +17,29 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_7dot1dot4.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + 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 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -120,29 +143,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_7dot1dot4.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - 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 { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/stereo_opus.textproto b/iamf/cli/textproto_templates/stereo_opus.textproto index 2514701..8059b8c 100644 --- a/iamf/cli/textproto_templates/stereo_opus.textproto +++ b/iamf/cli/textproto_templates/stereo_opus.textproto @@ -17,6 +17,19 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_stereo.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -112,19 +125,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_stereo.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - channel_metadatas: [ - { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, - { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } - ] -} - temporal_delimiter_metadata { enable_temporal_delimiters: false } diff --git a/iamf/cli/textproto_templates/stereo_pcm24bit.textproto b/iamf/cli/textproto_templates/stereo_pcm24bit.textproto index b956172..a5c60c6 100644 --- a/iamf/cli/textproto_templates/stereo_pcm24bit.textproto +++ b/iamf/cli/textproto_templates/stereo_pcm24bit.textproto @@ -17,6 +17,19 @@ test_vector_metadata { is_valid: true } +audio_frame_metadata { + wav_filename: "TEMPLATE_stereo.wav" + samples_to_trim_at_end_includes_padding: false + samples_to_trim_at_start_includes_codec_delay: false + samples_to_trim_at_end: 0 + samples_to_trim_at_start: 0 + audio_element_id: 300 + channel_metadatas: [ + { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, + { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } + ] +} + ia_sequence_header_metadata { primary_profile: PROFILE_VERSION_SIMPLE additional_profile: PROFILE_VERSION_SIMPLE @@ -108,19 +121,6 @@ mix_presentation_metadata { } } -audio_frame_metadata { - wav_filename: "TEMPLATE_stereo.wav" - samples_to_trim_at_end_includes_padding: false - samples_to_trim_at_start_includes_codec_delay: false - samples_to_trim_at_end: 0 - samples_to_trim_at_start: 0 - audio_element_id: 300 - channel_metadatas: [ - { channel_id: 0 channel_label: CHANNEL_LABEL_L_2 }, - { channel_id: 1 channel_label: CHANNEL_LABEL_R_2 } - ] -} - temporal_delimiter_metadata { enable_temporal_delimiters: false }