Fixed bug where Object gain vector did not account for LFE in the out…

…put array
videolabs · Feb 16, 2021 · 6e15883 · 6e15883
1 parent 79bfd48
commit 6e15883
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/include/AdmRenderer.h b/include/AdmRenderer.h
@@ -145,6 +145,8 @@ namespace admrender {
 		StreamInformation m_channelInformation;
 
 		Layout m_outputLayout;
+		// Index map to go from the output array excluding LFE to the full array with LFE
+		std::vector<unsigned int> m_mapNoLfeToLfe;
 
 		// Vector holding the last unique set metadata for each object in the stream
 		std::vector<ObjectMetadata> m_objectMetadata;

diff --git a/include/Tests.h b/include/Tests.h
@@ -189,7 +189,7 @@ static inline bool testPointSourcePanner()
 			velVec.x = 0.;
 			velVec.y = 0.;
 			velVec.z = 0.;
-			for (int i = 0; i < numCh; ++i)
+			for (unsigned int i = 0; i < numCh; ++i)
 			{
 				CartesianPosition speakerDirections = PolarToCartesian(layoutNoLFE.channels[i].polarPosition);
 				velVec = velVec + CartesianPosition{ gains[i] * speakerDirections.x, gains[i] * speakerDirections.y,gains[i] * speakerDirections.z, };

diff --git a/source/AdmRenderer.cpp b/source/AdmRenderer.cpp
@@ -170,6 +170,12 @@ namespace admrender {
 		if (!bBinConf)
 			return false;
 
+		// If the output layout has an LFE then get its index
+
+		for (int iSpk = 0; iSpk < m_outputLayout.channels.size(); ++iSpk)
+			if (!m_outputLayout.channels[iSpk].isLFE)
+				m_mapNoLfeToLfe.push_back(iSpk);
+
 		// Set up the buffers holding the direct and diffuse speaker signals
 		size_t nAmbiCh = m_outputLayout.channels.size();
 		m_speakerOut.resize(m_nOutputChannels);
@@ -235,13 +241,32 @@ namespace admrender {
 			// Store the metadata
 			m_objectMetadata[iObj] = metadata;
 			// Calculate a new gain vector with this metadata
-			std::vector<double> directGains;
-			std::vector<double> diffuseGains;
-			m_objectGainCalc->CalculateGains(metadata, directGains, diffuseGains);
+			std::vector<double> directGainsNoLFE;
+			std::vector<double> diffuseGainsNoLFE;
+			m_objectGainCalc->CalculateGains(metadata, directGainsNoLFE, diffuseGainsNoLFE);
 
 			// Apply scattering to the diffuse gains when output is binaural
 			if (m_RenderLayout == OutputLayout::Binaural)
-				diffuseGains = multiplyMatVec(m_scatteringMatrix, diffuseGains);
+				diffuseGainsNoLFE = multiplyMatVec(m_scatteringMatrix, diffuseGainsNoLFE);
+
+			std::vector<double> directGains;
+			std::vector<double> diffuseGains;
+			// Advance the index of any speakers after the LFE to leave a gap for the LFE
+			if (m_outputLayout.hasLFE)
+			{
+				directGains.resize(m_nOutputChannels, 0.);
+				diffuseGains.resize(m_nOutputChannels, 0.);
+				for (unsigned int i = 0; i < m_nOutputChannels - 1; ++i)
+				{
+					directGains[m_mapNoLfeToLfe[i]] = directGainsNoLFE[i];
+					diffuseGains[m_mapNoLfeToLfe[i]] = diffuseGainsNoLFE[i];
+				}
+			}
+			else
+			{
+				directGains = directGainsNoLFE;
+				diffuseGains = diffuseGainsNoLFE;
+			}
 
 			// Get the interpolation time
 			unsigned int interpLength = 0;