Merge branch 'release/M20190724'

Author: ardgzrivero

.gitmodules

@@ -6,3 +6,7 @@
 	path = 3dti_ResourceManager/third_party_libraries/cereal
 	url = https://github.com/USCiLab/cereal.git
 	branch = master
+[submodule "3dti_ResourceManager/third_party_libraries/eigen"]
+	path = 3dti_ResourceManager/third_party_libraries/eigen
+	url = https://github.com/eigenteam/eigen-git-mirror.git
+	branch = master

3dti_ResourceManager/HRTF/HRTFFactory.cpp

@@ -102,9 +102,9 @@ namespace HRTF
 
 	//////////////////////////////////////////////////////////////////////
 
-	bool CreateFromSofa(const std::string & sofafile, shared_ptr<Binaural::CListener> listener)
+	bool CreateFromSofa(const std::string & sofafile, shared_ptr<Binaural::CListener> listener, bool & specifiedDelays)
 	{
-		if (LoadHRTFTableFromSOFA(sofafile, listener))
+		if (LoadHRTFTableFromSOFA(sofafile, listener, specifiedDelays))
 		{
 			listener->GetHRTF()->EndSetup();
 			return true;
@@ -118,9 +118,9 @@ namespace HRTF
 
 	//////////////////////////////////////////////////////////////////////
 
-	bool Create3DTIFromSofa(const std::string & sofafile, shared_ptr<Binaural::CListener> listener)
+	bool Create3DTIFromSofa(const std::string & sofafile, shared_ptr<Binaural::CListener> listener, bool & specifiedDelays)
 	{
-		if (!LoadHRTFTableFromSOFA(sofafile, listener))
+		if (!LoadHRTFTableFromSOFA(sofafile, listener, specifiedDelays))
 		{
 			SET_RESULT(RESULT_ERROR_UNKNOWN, "Sofa exception creating HRTF, please consider previous messages from the sofa library");		
 			return false;
@@ -130,7 +130,7 @@ namespace HRTF
 
 	//////////////////////////////////////////////////////////////////////
 
-	bool LoadHRTFTableFromSOFA(const std::string & sofafile, shared_ptr<Binaural::CListener> listener)
+	bool LoadHRTFTableFromSOFA(const std::string & sofafile, shared_ptr<Binaural::CListener> listener, bool & specifiedDelays)
 	{		
 		std::ostream & output = std::cout;
 		try {
@@ -178,6 +178,23 @@ namespace HRTF
 
 			// Prepare HRTF
 			const unsigned int nSamples = (unsigned int)hrir.GetNumDataSamples();   // For example: 512 samples.			
+
+			if (delays.size() == data.size() / nSamples){
+				specifiedDelays = true;
+			}
+			else {
+				if (delays.size() == 2)
+				{
+					specifiedDelays = false;
+					SET_RESULT(RESULT_WARNING, "This HRTF file does not contain individual delays for each HRIR. Therefore, some comb filter effect can be perceived due to interpolations and custom head radius should not be used");
+				}
+				else
+				{
+					SET_RESULT(RESULT_ERROR_BADSIZE, "SOFA gives incoherent number of HRIRs and delays");
+					return false;
+				}
+			}
+
 			double distance = pos[array2DIndex(0, 2, nMeasurements, dims[1])];		//We consider that every HRIR are meased at the same distance, so we get the firts one
 			listener->GetHRTF()->BeginSetup(nSamples, distance);
 
@@ -192,14 +209,14 @@ namespace HRTF
 				while (elevation < 0) elevation += 360; // TODO: check who should do this
 
 				const int left_ear = 0;
-				hrir_value.leftDelay = delays[array2DIndex(i, left_ear, nMeasurements, 2)];
+				hrir_value.leftDelay = delays[specifiedDelays ? array2DIndex(i, left_ear, nMeasurements, 2) : 0];
 				for (std::size_t k = 0; k < nSamples; k++)
 				{
 					const std::size_t index = array3DIndex(i, left_ear, k, nMeasurements, 2, nSamples);
 					hrir_value.leftHRIR[k] = data[index];
 				}				
 				const int right_ear = 1;
-				hrir_value.rightDelay = delays[array2DIndex(i, right_ear, nMeasurements, 2)];
+				hrir_value.rightDelay = delays[specifiedDelays ? array2DIndex(i, right_ear, nMeasurements, 2) : 1];
 				for (std::size_t k = 0; k < nSamples; k++)
 				{
 					const std::size_t index = array3DIndex(i, right_ear, k, nMeasurements, 2, nSamples);

3dti_ResourceManager/HRTF/HRTFFactory.h

@@ -40,15 +40,15 @@ namespace HRTF
 	*	\param [out] listener affected by the hrtf
 	*   \eh On error, an error code is reported to the error handler.
 	*/
-	bool CreateFromSofa(const std::string & sofafile, shared_ptr<Binaural::CListener> listener);
+	bool CreateFromSofa(const std::string & sofafile, shared_ptr<Binaural::CListener> listener, bool & specifiedDelays);
 
 	/** \brief Loads an HRTF from SOFA file so a 3DTI file can be created later
 	*	\param [in] path of the sofa file
 	*	\param [out] listener affected by the hrtf
 	*   \eh On error, an error code is reported to the error handler. */
-	bool Create3DTIFromSofa(const std::string & sofafile, shared_ptr<Binaural::CListener> listener);
+	bool Create3DTIFromSofa(const std::string & sofafile, shared_ptr<Binaural::CListener> listener, bool & specifiedDelays);
 
-	bool LoadHRTFTableFromSOFA(const std::string & sofafile, shared_ptr<Binaural::CListener> listener);
+	bool LoadHRTFTableFromSOFA(const std::string & sofafile, shared_ptr<Binaural::CListener> listener, bool & specifiedDelays);
 
     //static CHRTF CreateFromListen(const std::vector<std::string> & listenFiles);
 };

3dti_ResourceManager/third_party_libraries/eigen

@@ -222,6 +222,27 @@ namespace Common {
 		}		
 	}
 
+	void CFprocessor::ProcessToPowerPhase(const std::vector<float>& inputBuffer, std::vector<float>& powerBuffer, std::vector<float>& phaseBuffer)
+	{
+		ASSERT(inputBuffer.size() > 0, RESULT_ERROR_BADSIZE, "Bad input size", "");
+
+		if (inputBuffer.size() > 0) {
+
+			powerBuffer.clear();
+			phaseBuffer.clear();
+
+			int end = (int)(inputBuffer.size()*0.5);
+
+			for (int i = 0; i < end; i++)
+			{
+				float real = inputBuffer[2 * i];
+				float img = inputBuffer[2 * i + 1];
+
+				powerBuffer.push_back(real*real + img*img);
+				phaseBuffer.push_back(std::atan2(img, real));
+			}
+		}
+	}
 
 	void CFprocessor::ProcessToRealImaginary(const std::vector<float>& moduleBuffer, const std::vector<float>& phaseBuffer, std::vector<float>& outputBuffer)
 	{

3dti_Toolkit/Common/Fprocessor.cpp

@@ -90,6 +90,15 @@ namespace Common {
 		*/
 		static void ProcessToModulePhase(const std::vector<float>& inputBuffer, std::vector<float>& moduleBuffer, std::vector<float>& phaseBuffer);
 
+		/** \brief Process a buffer with complex numbers to get two separated vectors one with the powers and other with the phases.
+		*   \details This method return two vectors with the power and phase of the vector introduced.
+		*   \param [in] inputBuffer Vector of samples that has real and imaginary parts interlaced. inputBuffer[i] = Re[Xj], x[i+1] = Img[Xj]
+		*	\param [out] powerBuffer Vector of real numbers that are the power of the complex numbers. moduleBuffer[i] = inputBuffer[2 * i]^2 * inputBuffer[2 * i + 1]^2
+		*	\param [out] phaseBuffer  Vector of real numbers that are the argument of the complex numbers.	phaseBuffer [i] = atan(inputBuffer[2 * i + 1] / inputBuffer[2 * i]^2)
+		*   \throws May throw exceptions and errors to debugger
+		*/
+		static void ProcessToPowerPhase(const std::vector<float>& inputBuffer, std::vector<float>& powerBuffer, std::vector<float>& phaseBuffer);
+
 		/** \brief Process two buffers with module and phase of complex numbers, in order to get a vector with complex numbers in binomial way
 		*   \details This method return one vectors that has real and imaginary parts interlaced. inputBuffer[i] = Re[Xj], x[i+1] = Img[Xj]
 		*   \param [in] moduleBuffer Vector of samples that represents the module of complex numbers.