Recompute 9.1.6-related matrices.

- Fix an issue where a 22.2 matrix was transposed, which causes many matrices related to 9.1.6 to have a strange ordering (e.g. ambisonics -> 9.1.6, channel-based to 9.1.6). - Avoid losing half of LFE1 when underlying matrices are 22.2. - audio_element_renderer_channel_to_channel_test.cc`: Test that LFE passes through when rendering to or from 9.1.6. - 9.1.6 -> 3.1.2 is now computed by going through 7.1.4. - Recompute loudness for related test vectors. PiperOrigin-RevId: 665351207
AOMediaCodec · Aug 20, 2024 · 42f4caf · 42f4caf
1 parent 1d2e00a
commit 42f4caf
Show file tree

Hide file tree

Showing 12 changed files with 349 additions and 352 deletions.
diff --git a/iamf/cli/renderer/precomputed_gains.cc b/iamf/cli/renderer/precomputed_gains.cc
diff --git a/iamf/cli/testdata/test_000131.textproto b/iamf/cli/testdata/test_000131.textproto
@@ -141,8 +141,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -4495
-        digital_peak: -4078
+        integrated_loudness: -3064
+        digital_peak: -2928
       }
     }
   }

diff --git a/iamf/cli/testdata/test_000602.textproto b/iamf/cli/testdata/test_000602.textproto
@@ -179,7 +179,7 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -3122
+        integrated_loudness: -3159
         digital_peak: -406
       }
     }

diff --git a/iamf/cli/testdata/test_000610.textproto b/iamf/cli/testdata/test_000610.textproto
@@ -172,8 +172,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -3547
-        digital_peak: -2432
+        integrated_loudness: -2951
+        digital_peak: -1957
       }
     }
   }

diff --git a/iamf/cli/testdata/test_000611.textproto b/iamf/cli/testdata/test_000611.textproto
@@ -172,8 +172,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -4960
-        digital_peak: -1750
+        integrated_loudness: -4643
+        digital_peak: -1772
       }
     }
   }

diff --git a/iamf/cli/testdata/test_000612.textproto b/iamf/cli/testdata/test_000612.textproto
@@ -184,8 +184,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -6339
-        digital_peak: -3306
+        integrated_loudness: -5388
+        digital_peak: -2125
       }
     }
   }

diff --git a/iamf/cli/testdata/test_000613.textproto b/iamf/cli/testdata/test_000613.textproto
@@ -191,8 +191,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -6076
-        digital_peak: -3492
+        integrated_loudness: -5320
+        digital_peak: -2009
       }
     }
   }

diff --git a/iamf/cli/testdata/test_000616.textproto b/iamf/cli/testdata/test_000616.textproto
@@ -172,7 +172,7 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -4067
+        integrated_loudness: -4048
         digital_peak: -496
       }
     }

diff --git a/iamf/cli/testdata/test_000619.textproto b/iamf/cli/testdata/test_000619.textproto
@@ -186,8 +186,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -4411
-        digital_peak: -3351
+        integrated_loudness: -4401
+        digital_peak: -2490
       }
     }
     layouts {
@@ -200,8 +200,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -6654
-        digital_peak: -4027
+        integrated_loudness: -6462
+        digital_peak: -4201
       }
     }
   }
@@ -221,7 +221,7 @@ audio_frame_metadata: [
     samples_to_trim_at_end: 640
     samples_to_trim_at_start: 0
     audio_element_id: 301
-    channel_ids: [3, 4]
+    channel_ids: [4, 5]
     channel_labels: ["Lss7", "Rss7"]
   }
 ]

diff --git a/iamf/cli/testdata/test_000623.textproto b/iamf/cli/testdata/test_000623.textproto
@@ -200,8 +200,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -5719
-        digital_peak: -1639
+        integrated_loudness: -4726
+        digital_peak: -1676
       }
     }
   }

diff --git a/iamf/cli/testdata/test_000633.textproto b/iamf/cli/testdata/test_000633.textproto
@@ -172,8 +172,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -7174
-        digital_peak: -7026
+        integrated_loudness: -5571
+        digital_peak: -4955
       }
     }
   }

diff --git a/iamf/cli/testdata/test_000701.textproto b/iamf/cli/testdata/test_000701.textproto
@@ -214,8 +214,8 @@ mix_presentation_metadata {
       }
       loudness {
         info_type_bit_masks: []
-        integrated_loudness: -7174
-        digital_peak: -7026
+        integrated_loudness: -5571
+        digital_peak: -4955
       }
     }
   }