Skip to content

Commit

Permalink
Update mix presentation "mix gain" fields to agree with the spec.
Browse files Browse the repository at this point in the history 
  - Using new fields that remove an unneeded layer of indirection.
  - Based on AOMediaCodec/iamf-tools@05c2d58b for `github/aomediacodec/libiamf/v1.0.0-errata`.
  • Loading branch information
@jwcullen
jwcullen committed Aug 16, 2024
1 parent 12953a6 commit 3221650
Show file tree
Hide file tree
Showing 178 changed files with 2,196 additions and 2,949 deletions.
29 changes: 27 additions & 2 deletions proto/mix_presentation.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ message MixPresentationElementAnnotations {
}

message ElementMixConfig {
option deprecated = true;

optional MixGainParamDefinition mix_gain = 1;
}

Expand Down Expand Up @@ -56,10 +58,14 @@ message SubMixAudioElement {
repeated string localized_element_annotations = 6;

optional RenderingConfig rendering_config = 5;
optional ElementMixConfig element_mix_config = 3;
// Superseded by `element_mix_gain`.
optional ElementMixConfig element_mix_config = 3 [deprecated = true];
optional MixGainParamDefinition element_mix_gain = 7;
}

message OutputMixConfig {
option deprecated = true;

optional MixGainParamDefinition output_mix_gain = 1;
}

Expand Down Expand Up @@ -155,11 +161,25 @@ message MixPresentationLayout {
message MixPresentationSubMix {
optional uint32 num_audio_elements = 1;
repeated SubMixAudioElement audio_elements = 2;
optional OutputMixConfig output_mix_config = 3;

// Superseded by `output_mix_gain`.
optional OutputMixConfig output_mix_config = 3 [deprecated = true];
optional MixGainParamDefinition output_mix_gain = 6;

optional uint32 num_layouts = 4;
repeated MixPresentationLayout layouts = 5;
}

message MixPresentationTag {
optional string tag_name = 1;
optional string tag_value = 2;
}

message MixPresentationTags {
optional uint32 num_tags = 1;
repeated MixPresentationTag tags = 2;
}

message MixPresentationObuMetadata {
reserved 2;
optional uint32 mix_presentation_id = 1;
Expand All @@ -178,5 +198,10 @@ message MixPresentationObuMetadata {

optional uint32 num_sub_mixes = 3;
repeated MixPresentationSubMix sub_mixes = 4;

// When true, `mix_presentation_tags` will be examined.
optional bool include_mix_presentation_tags = 11;
optional MixPresentationTags mix_presentation_tags = 12;

optional ObuHeaderMetadata obu_header = 8;
}
2 changes: 1 addition & 1 deletion tests/coverage.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"3.6.4","coupled_substream_count","test_000123, test_000132"
"3.6.4","subtream_count","test_000123, test_000132"
"3.7","count_label","test_000060"
"3.7","element_mix_config","test_000064"
"3.7","element_mix_gain","test_000064"
"3.7","language_label","test_000060"
"3.7","loudness_layout","test_000126"
"3.7","loudness_layout == 3.1.2","test_000069"
Expand Down
24 changes: 10 additions & 14 deletions tests/test_000000_3.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,7 @@ mix_presentation_metadata {
rendering_config {
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
}
element_mix_config {
mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
}
}
output_mix_config {
output_mix_gain {
element_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
Expand All @@ -114,6 +101,15 @@ mix_presentation_metadata {
default_mix_gain: 0
}
}
output_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
num_layouts: 1
layouts {
loudness_layout {
Expand Down
24 changes: 10 additions & 14 deletions tests/test_000002.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,7 @@ mix_presentation_metadata {
rendering_config {
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
}
element_mix_config {
mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
}
}
output_mix_config {
output_mix_gain {
element_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
Expand All @@ -122,6 +109,15 @@ mix_presentation_metadata {
default_mix_gain: 0
}
}
output_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
num_layouts: 1
layouts {
loudness_layout {
Expand Down
24 changes: 10 additions & 14 deletions tests/test_000003.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,7 @@ mix_presentation_metadata {
rendering_config {
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
}
element_mix_config {
mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
}
}
output_mix_config {
output_mix_gain {
element_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
Expand All @@ -122,6 +109,15 @@ mix_presentation_metadata {
default_mix_gain: 0
}
}
output_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
num_layouts: 1
layouts {
loudness_layout {
Expand Down
24 changes: 10 additions & 14 deletions tests/test_000005.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,7 @@ mix_presentation_metadata {
rendering_config {
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
}
element_mix_config {
mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
}
}
output_mix_config {
output_mix_gain {
element_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
Expand All @@ -108,6 +95,15 @@ mix_presentation_metadata {
default_mix_gain: 0
}
}
output_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
num_layouts: 1
layouts {
loudness_layout {
Expand Down
24 changes: 10 additions & 14 deletions tests/test_000006.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,7 @@ mix_presentation_metadata {
rendering_config {
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
}
element_mix_config {
mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
}
}
output_mix_config {
output_mix_gain {
element_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
Expand All @@ -115,6 +102,15 @@ mix_presentation_metadata {
default_mix_gain: 0
}
}
output_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
num_layouts: 1
layouts {
loudness_layout {
Expand Down
24 changes: 10 additions & 14 deletions tests/test_000007.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,7 @@ mix_presentation_metadata {
rendering_config {
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
}
element_mix_config {
mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
}
}
output_mix_config {
output_mix_gain {
element_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
Expand All @@ -109,6 +96,15 @@ mix_presentation_metadata {
default_mix_gain: 0
}
}
output_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
num_layouts: 1
layouts {
loudness_layout {
Expand Down
24 changes: 10 additions & 14 deletions tests/test_000012.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,7 @@ mix_presentation_metadata {
rendering_config {
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
}
element_mix_config {
mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
}
}
output_mix_config {
output_mix_gain {
element_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
Expand All @@ -108,6 +95,15 @@ mix_presentation_metadata {
default_mix_gain: 0
}
}
output_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
num_layouts: 1
layouts {
loudness_layout {
Expand Down
24 changes: 10 additions & 14 deletions tests/test_000013.textproto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,7 @@ mix_presentation_metadata {
rendering_config {
headphones_rendering_mode: HEADPHONES_RENDERING_MODE_STEREO
}
element_mix_config {
mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
}
}
output_mix_config {
output_mix_gain {
element_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
Expand All @@ -108,6 +95,15 @@ mix_presentation_metadata {
default_mix_gain: 0
}
}
output_mix_gain {
param_definition {
parameter_id: 100
parameter_rate: 16000
param_definition_mode: 1
reserved: 0
}
default_mix_gain: 0
}
num_layouts: 1
layouts {
loudness_layout {
Expand Down
Loading

0 comments on commit 3221650

Please sign in to comment.