Skip to content

Commit

Permalink
Move audio frame metadata to the top of the templates, for convenience
Browse files Browse the repository at this point in the history 
  - Now the "instructions" are close to fields they say to modify.

PiperOrigin-RevId: 715145666
  • Loading branch information
@jwcullen
jwcullen committed Jan 14, 2025
1 parent 4e74eb9 commit 3eb9570
Show file tree
Hide file tree
Showing 16 changed files with 368 additions and 368 deletions.
58 changes: 29 additions & 29 deletions iamf/cli/textproto_templates/1OA_and_stereo_opus.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
58 changes: 29 additions & 29 deletions iamf/cli/textproto_templates/1OA_and_stereo_pcm24bit.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
30 changes: 15 additions & 15 deletions iamf/cli/textproto_templates/1OA_opus.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
30 changes: 15 additions & 15 deletions iamf/cli/textproto_templates/1OA_pcm24bit.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
82 changes: 41 additions & 41 deletions iamf/cli/textproto_templates/3OA_and_stereo_opus.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Loading

0 comments on commit 3eb9570

Please sign in to comment.