Merge pull request #978 from DolbyLaboratories/dolby/ac4_level_4

fix upmix object number for AC4 level 4.
axiomatic-systems · Sep 16, 2024 · 928e9ed · 928e9ed
2 parents 725caa5 + df13e92
commit 928e9ed
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Source/C++/Core/Ap4Dac4Atom.cpp b/Source/C++/Core/Ap4Dac4Atom.cpp
@@ -664,11 +664,12 @@ AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubStreamInfoAjoc(AP4_BitReader &bits,
         // oamd_common_data()
         ParseOamdCommonData(bits);
     }
-    n_umx_objects_minus1 = bits.ReadBits(4);
-    int nFullbandUpmixSignals = n_umx_objects_minus1 + 1;
+    int nFullbandUpmixSignalsMinus = bits.ReadBits(4);
+    int nFullbandUpmixSignals = nFullbandUpmixSignalsMinus + 1;
     if (nFullbandUpmixSignals == 16) {
         nFullbandUpmixSignals += AP4_Ac4VariableBits(bits, 3);
     }
+    n_umx_objects_minus1 = nFullbandUpmixSignals - 1;
 
     BedDynObjAssignment(bits, nFullbandUpmixSignals, true);
     ParseDsiSfMutiplier(bits, fs_idx);