Skip to content

Commit 551f307

Browse files
jwcullentdaede
jwcullen
authored and
tdaede
committed
Update mix presentation "mix gain" fields to agree with the spec.
 - Using new fields that remove an unneeded layer of indirection. - Based on AOMediaCodec/iamf-tools@05c2d58b for `github/aomediacodec/libiamf/v1.0.0-errata`.
1 parent e2ff448 commit 551f307

178 files changed

Lines changed: 2181 additions & 2949 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: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ message MixPresentationElementAnnotations {
2828
}
2929

3030
message ElementMixConfig {
31+
option deprecated = true;
32+
3133
optional MixGainParamDefinition mix_gain = 1;
3234
}
3335

@@ -56,10 +58,14 @@ message SubMixAudioElement {
5658
repeated string localized_element_annotations = 6;
5759

5860
optional RenderingConfig rendering_config = 5;
59-
optional ElementMixConfig element_mix_config = 3;
61+
// Superseded by `element_mix_gain`.
62+
optional ElementMixConfig element_mix_config = 3 [deprecated = true];
63+
optional MixGainParamDefinition element_mix_gain = 7;
6064
}
6165

6266
message OutputMixConfig {
67+
option deprecated = true;
68+
6369
optional MixGainParamDefinition output_mix_gain = 1;
6470
}
6571

@@ -155,7 +161,11 @@ message MixPresentationLayout {
155161
message MixPresentationSubMix {
156162
optional uint32 num_audio_elements = 1;
157163
repeated SubMixAudioElement audio_elements = 2;
158-
optional OutputMixConfig output_mix_config = 3;
164+
165+
// Superseded by `output_mix_gain`.
166+
optional OutputMixConfig output_mix_config = 3 [deprecated = true];
167+
optional MixGainParamDefinition output_mix_gain = 6;
168+
159169
optional uint32 num_layouts = 4;
160170
repeated MixPresentationLayout layouts = 5;
161171
}

‎tests/coverage.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"3.6.4","coupled_substream_count","test_000123, test_000132"
5959
"3.6.4","subtream_count","test_000123, test_000132"
6060
"3.7","count_label","test_000060"
61-
"3.7","element_mix_config","test_000064"
61+
"3.7","element_mix_gain","test_000064"
6262
"3.7","language_label","test_000060"
6363
"3.7","loudness_layout","test_000126"
6464
"3.7","loudness_layout == 3.1.2","test_000069"

‎tests/test_000000_3.textproto‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,7 @@ mix_presentation_metadata {
9191
rendering_config {
9292
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
9393
}
94-
element_mix_config {
95-
mix_gain {
96-
param_definition {
97-
parameter_id: 100
98-
parameter_rate: 16000
99-
param_definition_mode: 1
100-
reserved: 0
101-
}
102-
default_mix_gain: 0
103-
}
104-
}
105-
}
106-
output_mix_config {
107-
output_mix_gain {
94+
element_mix_gain {
10895
param_definition {
10996
parameter_id: 100
11097
parameter_rate: 16000
@@ -114,6 +101,15 @@ mix_presentation_metadata {
114101
default_mix_gain: 0
115102
}
116103
}
104+
output_mix_gain {
105+
param_definition {
106+
parameter_id: 100
107+
parameter_rate: 16000
108+
param_definition_mode: 1
109+
reserved: 0
110+
}
111+
default_mix_gain: 0
112+
}
117113
num_layouts: 1
118114
layouts {
119115
loudness_layout {

‎tests/test_000002.textproto‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,7 @@ mix_presentation_metadata {
9999
rendering_config {
100100
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
101101
}
102-
element_mix_config {
103-
mix_gain {
104-
param_definition {
105-
parameter_id: 100
106-
parameter_rate: 16000
107-
param_definition_mode: 1
108-
reserved: 0
109-
}
110-
default_mix_gain: 0
111-
}
112-
}
113-
}
114-
output_mix_config {
115-
output_mix_gain {
102+
element_mix_gain {
116103
param_definition {
117104
parameter_id: 100
118105
parameter_rate: 16000
@@ -122,6 +109,15 @@ mix_presentation_metadata {
122109
default_mix_gain: 0
123110
}
124111
}
112+
output_mix_gain {
113+
param_definition {
114+
parameter_id: 100
115+
parameter_rate: 16000
116+
param_definition_mode: 1
117+
reserved: 0
118+
}
119+
default_mix_gain: 0
120+
}
125121
num_layouts: 1
126122
layouts {
127123
loudness_layout {

‎tests/test_000003.textproto‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,7 @@ mix_presentation_metadata {
9999
rendering_config {
100100
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
101101
}
102-
element_mix_config {
103-
mix_gain {
104-
param_definition {
105-
parameter_id: 100
106-
parameter_rate: 16000
107-
param_definition_mode: 1
108-
reserved: 0
109-
}
110-
default_mix_gain: 0
111-
}
112-
}
113-
}
114-
output_mix_config {
115-
output_mix_gain {
102+
element_mix_gain {
116103
param_definition {
117104
parameter_id: 100
118105
parameter_rate: 16000
@@ -122,6 +109,15 @@ mix_presentation_metadata {
122109
default_mix_gain: 0
123110
}
124111
}
112+
output_mix_gain {
113+
param_definition {
114+
parameter_id: 100
115+
parameter_rate: 16000
116+
param_definition_mode: 1
117+
reserved: 0
118+
}
119+
default_mix_gain: 0
120+
}
125121
num_layouts: 1
126122
layouts {
127123
loudness_layout {

‎tests/test_000005.textproto‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,7 @@ mix_presentation_metadata {
8585
rendering_config {
8686
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
8787
}
88-
element_mix_config {
89-
mix_gain {
90-
param_definition {
91-
parameter_id: 100
92-
parameter_rate: 16000
93-
param_definition_mode: 1
94-
reserved: 0
95-
}
96-
default_mix_gain: 0
97-
}
98-
}
99-
}
100-
output_mix_config {
101-
output_mix_gain {
88+
element_mix_gain {
10289
param_definition {
10390
parameter_id: 100
10491
parameter_rate: 16000
@@ -108,6 +95,15 @@ mix_presentation_metadata {
10895
default_mix_gain: 0
10996
}
11097
}
98+
output_mix_gain {
99+
param_definition {
100+
parameter_id: 100
101+
parameter_rate: 16000
102+
param_definition_mode: 1
103+
reserved: 0
104+
}
105+
default_mix_gain: 0
106+
}
111107
num_layouts: 1
112108
layouts {
113109
loudness_layout {

‎tests/test_000006.textproto‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,7 @@ mix_presentation_metadata {
9292
rendering_config {
9393
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
9494
}
95-
element_mix_config {
96-
mix_gain {
97-
param_definition {
98-
parameter_id: 100
99-
parameter_rate: 16000
100-
param_definition_mode: 1
101-
reserved: 0
102-
}
103-
default_mix_gain: 0
104-
}
105-
}
106-
}
107-
output_mix_config {
108-
output_mix_gain {
95+
element_mix_gain {
10996
param_definition {
11097
parameter_id: 100
11198
parameter_rate: 16000
@@ -115,6 +102,15 @@ mix_presentation_metadata {
115102
default_mix_gain: 0
116103
}
117104
}
105+
output_mix_gain {
106+
param_definition {
107+
parameter_id: 100
108+
parameter_rate: 16000
109+
param_definition_mode: 1
110+
reserved: 0
111+
}
112+
default_mix_gain: 0
113+
}
118114
num_layouts: 1
119115
layouts {
120116
loudness_layout {

‎tests/test_000007.textproto‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,7 @@ mix_presentation_metadata {
8686
rendering_config {
8787
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
8888
}
89-
element_mix_config {
90-
mix_gain {
91-
param_definition {
92-
parameter_id: 100
93-
parameter_rate: 16000
94-
param_definition_mode: 1
95-
reserved: 0
96-
}
97-
default_mix_gain: 0
98-
}
99-
}
100-
}
101-
output_mix_config {
102-
output_mix_gain {
89+
element_mix_gain {
10390
param_definition {
10491
parameter_id: 100
10592
parameter_rate: 16000
@@ -109,6 +96,15 @@ mix_presentation_metadata {
10996
default_mix_gain: 0
11097
}
11198
}
99+
output_mix_gain {
100+
param_definition {
101+
parameter_id: 100
102+
parameter_rate: 16000
103+
param_definition_mode: 1
104+
reserved: 0
105+
}
106+
default_mix_gain: 0
107+
}
112108
num_layouts: 1
113109
layouts {
114110
loudness_layout {

‎tests/test_000012.textproto‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,7 @@ mix_presentation_metadata {
8585
rendering_config {
8686
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
8787
}
88-
element_mix_config {
89-
mix_gain {
90-
param_definition {
91-
parameter_id: 100
92-
parameter_rate: 16000
93-
param_definition_mode: 1
94-
reserved: 0
95-
}
96-
default_mix_gain: 0
97-
}
98-
}
99-
}
100-
output_mix_config {
101-
output_mix_gain {
88+
element_mix_gain {
10289
param_definition {
10390
parameter_id: 100
10491
parameter_rate: 16000
@@ -108,6 +95,15 @@ mix_presentation_metadata {
10895
default_mix_gain: 0
10996
}
11097
}
98+
output_mix_gain {
99+
param_definition {
100+
parameter_id: 100
101+
parameter_rate: 16000
102+
param_definition_mode: 1
103+
reserved: 0
104+
}
105+
default_mix_gain: 0
106+
}
111107
num_layouts: 1
112108
layouts {
113109
loudness_layout {

‎tests/test_000013.textproto‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,7 @@ mix_presentation_metadata {
8585
rendering_config {
8686
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
8787
}
88-
element_mix_config {
89-
mix_gain {
90-
param_definition {
91-
parameter_id: 100
92-
parameter_rate: 16000
93-
param_definition_mode: 1
94-
reserved: 0
95-
}
96-
default_mix_gain: 0
97-
}
98-
}
99-
}
100-
output_mix_config {
101-
output_mix_gain {
88+
element_mix_gain {
10289
param_definition {
10390
parameter_id: 100
10491
parameter_rate: 16000
@@ -108,6 +95,15 @@ mix_presentation_metadata {
10895
default_mix_gain: 0
10996
}
11097
}
98+
output_mix_gain {
99+
param_definition {
100+
parameter_id: 100
101+
parameter_rate: 16000
102+
param_definition_mode: 1
103+
reserved: 0
104+
}
105+
default_mix_gain: 0
106+
}
111107
num_layouts: 1
112108
layouts {
113109
loudness_layout {

0 commit comments

Comments
 (0)