Skip to content

Commit e2ff448

Browse files
jwcullentdaede
jwcullen
authored and
tdaede
committed
Update mix presentation annotations field names to agree with the spec.
 - Using new field names that remove an uneeded layer of indirection and better match the usage intention. - Update all test vectors to agree wit - Note `test_000060` provides an example with `count_labels > 2`. - Based on AOMediaCodec/iamf-tools@5edf02d.
1 parent b107327 commit e2ff448

176 files changed

Lines changed: 593 additions & 2102 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎proto/mix_presentation.proto‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ import "obu_header.proto";
1616
import "param_definitions.proto";
1717

1818
message MixPresentationAnnotations {
19+
option deprecated = true;
20+
1921
optional string mix_presentation_friendly_label = 1;
2022
}
2123

2224
message MixPresentationElementAnnotations {
25+
option deprecated = true;
26+
2327
optional string audio_element_friendly_label = 1;
2428
}
2529

@@ -45,8 +49,12 @@ message RenderingConfig {
4549
message SubMixAudioElement {
4650
optional uint32 audio_element_id = 1;
4751
reserved 2;
52+
// Superseded by `localized_element_annotations`.
4853
repeated MixPresentationElementAnnotations
49-
mix_presentation_element_annotations_array = 4;
54+
mix_presentation_element_annotations_array = 4 [deprecated = true];
55+
// Length should be equal to `count_label` in the OBU.
56+
repeated string localized_element_annotations = 6;
57+
5058
optional RenderingConfig rendering_config = 5;
5159
optional ElementMixConfig element_mix_config = 3;
5260
}
@@ -153,11 +161,21 @@ message MixPresentationSubMix {
153161
}
154162

155163
message MixPresentationObuMetadata {
164+
reserved 2;
156165
optional uint32 mix_presentation_id = 1;
157166
optional uint32 count_label = 5;
158-
repeated string language_labels = 6;
159-
reserved 2;
160-
repeated MixPresentationAnnotations mix_presentation_annotations_array = 7;
167+
168+
// Superseded by `annotations_language`.
169+
repeated string language_labels = 6 [deprecated = true];
170+
// Length should be equal to `count_label`.
171+
repeated string annotations_language = 9;
172+
173+
// Superseded by `localized_presentation_annotations`.
174+
repeated MixPresentationAnnotations mix_presentation_annotations_array = 7
175+
[deprecated = true];
176+
// Length should be equal to `count_label`.
177+
repeated string localized_presentation_annotations = 10;
178+
161179
optional uint32 num_sub_mixes = 3;
162180
repeated MixPresentationSubMix sub_mixes = 4;
163181
optional ObuHeaderMetadata obu_header = 8;

‎tests/test_000000_3.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,14 @@ audio_element_metadata {
8080
mix_presentation_metadata {
8181
mix_presentation_id: 42
8282
count_label: 1
83-
language_labels: ["en-us"]
84-
mix_presentation_annotations_array: [
85-
{
86-
mix_presentation_friendly_label: "test_mix_pres"
87-
}
88-
]
83+
annotations_language: ["en-us"]
84+
localized_presentation_annotations: ["test_mix_pres"]
8985
num_sub_mixes: 1
9086
sub_mixes {
9187
num_audio_elements: 1
9288
audio_elements {
9389
audio_element_id: 300
94-
mix_presentation_element_annotations_array: [
95-
{
96-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
97-
}
98-
]
90+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
9991
rendering_config {
10092
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
10193
}

‎tests/test_000002.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,14 @@ audio_element_metadata {
8888
mix_presentation_metadata {
8989
mix_presentation_id: 42
9090
count_label: 1
91-
language_labels: ["en-us"]
92-
mix_presentation_annotations_array: [
93-
{
94-
mix_presentation_friendly_label: "test_mix_pres"
95-
}
96-
]
91+
annotations_language: ["en-us"]
92+
localized_presentation_annotations: ["test_mix_pres"]
9793
num_sub_mixes: 1
9894
sub_mixes {
9995
num_audio_elements: 1
10096
audio_elements {
10197
audio_element_id: 300
102-
mix_presentation_element_annotations_array: [
103-
{
104-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
105-
}
106-
]
98+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
10799
rendering_config {
108100
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
109101
}

‎tests/test_000003.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,14 @@ audio_element_metadata {
8888
mix_presentation_metadata {
8989
mix_presentation_id: 42
9090
count_label: 1
91-
language_labels: ["en-us"]
92-
mix_presentation_annotations_array: [
93-
{
94-
mix_presentation_friendly_label: "test_mix_pres"
95-
}
96-
]
91+
annotations_language: ["en-us"]
92+
localized_presentation_annotations: ["test_mix_pres"]
9793
num_sub_mixes: 1
9894
sub_mixes {
9995
num_audio_elements: 1
10096
audio_elements {
10197
audio_element_id: 300
102-
mix_presentation_element_annotations_array: [
103-
{
104-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
105-
}
106-
]
98+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
10799
rendering_config {
108100
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
109101
}

‎tests/test_000005.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,14 @@ audio_element_metadata {
7474
mix_presentation_metadata {
7575
mix_presentation_id: 42
7676
count_label: 1
77-
language_labels: ["en-us"]
78-
mix_presentation_annotations_array: [
79-
{
80-
mix_presentation_friendly_label: "test_mix_pres"
81-
}
82-
]
77+
annotations_language: ["en-us"]
78+
localized_presentation_annotations: ["test_mix_pres"]
8379
num_sub_mixes: 1
8480
sub_mixes {
8581
num_audio_elements: 1
8682
audio_elements {
8783
audio_element_id: 300
88-
mix_presentation_element_annotations_array: [
89-
{
90-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
91-
}
92-
]
84+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
9385
rendering_config {
9486
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
9587
}

‎tests/test_000006.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,14 @@ audio_element_metadata {
8181
mix_presentation_metadata {
8282
mix_presentation_id: 42
8383
count_label: 1
84-
language_labels: ["en-us"]
85-
mix_presentation_annotations_array: [
86-
{
87-
mix_presentation_friendly_label: "test_mix_pres"
88-
}
89-
]
84+
annotations_language: ["en-us"]
85+
localized_presentation_annotations: ["test_mix_pres"]
9086
num_sub_mixes: 1
9187
sub_mixes {
9288
num_audio_elements: 1
9389
audio_elements {
9490
audio_element_id: 300
95-
mix_presentation_element_annotations_array: [
96-
{
97-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
98-
}
99-
]
91+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
10092
rendering_config {
10193
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
10294
}

‎tests/test_000007.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,14 @@ audio_element_metadata {
7575
mix_presentation_metadata {
7676
mix_presentation_id: 42
7777
count_label: 1
78-
language_labels: ["en-us"]
79-
mix_presentation_annotations_array: [
80-
{
81-
mix_presentation_friendly_label: "test_mix_pres"
82-
}
83-
]
78+
annotations_language: ["en-us"]
79+
localized_presentation_annotations: ["test_mix_pres"]
8480
num_sub_mixes: 1
8581
sub_mixes {
8682
num_audio_elements: 1
8783
audio_elements {
8884
audio_element_id: 300
89-
mix_presentation_element_annotations_array: [
90-
{
91-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
92-
}
93-
]
85+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
9486
rendering_config {
9587
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
9688
}

‎tests/test_000012.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,14 @@ audio_element_metadata {
7474
mix_presentation_metadata {
7575
mix_presentation_id: 42
7676
count_label: 1
77-
language_labels: ["en-us"]
78-
mix_presentation_annotations_array: [
79-
{
80-
mix_presentation_friendly_label: "test_mix_pres"
81-
}
82-
]
77+
annotations_language: ["en-us"]
78+
localized_presentation_annotations: ["test_mix_pres"]
8379
num_sub_mixes: 1
8480
sub_mixes {
8581
num_audio_elements: 1
8682
audio_elements {
8783
audio_element_id: 300
88-
mix_presentation_element_annotations_array: [
89-
{
90-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
91-
}
92-
]
84+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
9385
rendering_config {
9486
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
9587
}

‎tests/test_000013.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,14 @@ audio_element_metadata {
7474
mix_presentation_metadata {
7575
mix_presentation_id: 42
7676
count_label: 1
77-
language_labels: ["en-us"]
78-
mix_presentation_annotations_array: [
79-
{
80-
mix_presentation_friendly_label: "test_mix_pres"
81-
}
82-
]
77+
annotations_language: ["en-us"]
78+
localized_presentation_annotations: ["test_mix_pres"]
8379
num_sub_mixes: 1
8480
sub_mixes {
8581
num_audio_elements: 1
8682
audio_elements {
8783
audio_element_id: 300
88-
mix_presentation_element_annotations_array: [
89-
{
90-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
91-
}
92-
]
84+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
9385
rendering_config {
9486
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
9587
}

‎tests/test_000014.textproto‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,14 @@ audio_element_metadata {
8383
mix_presentation_metadata {
8484
mix_presentation_id: 42
8585
count_label: 1
86-
language_labels: ["en-us"]
87-
mix_presentation_annotations_array: [
88-
{
89-
mix_presentation_friendly_label: "test_mix_pres"
90-
}
91-
]
86+
annotations_language: ["en-us"]
87+
localized_presentation_annotations: ["test_mix_pres"]
9288
num_sub_mixes: 1
9389
sub_mixes {
9490
num_audio_elements: 1
9591
audio_elements {
9692
audio_element_id: 300
97-
mix_presentation_element_annotations_array: [
98-
{
99-
audio_element_friendly_label: "test_sub_mix_0_audio_element_0"
100-
}
101-
]
93+
localized_element_annotations: ["test_sub_mix_0_audio_element_0"]
10294
rendering_config {
10395
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
10496
}

0 commit comments

Comments
 (0)