Commit 671c3271 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

fixes in binaural mixdown repro and vbap FF renderer (wrong include paths)

parent 2a46a2fd
......@@ -7,7 +7,7 @@
#include "../../../VAAudiostreamTracker.h"
#include "../../../VACoreImpl.h"
#include "../../../VACoreConfig.h"
#include "../../../VAException.h"
#include <VAException.h>
#include "../../../VALog.h"
#include <ITAConfigUtils.h>
......@@ -650,4 +650,4 @@ VAVec3 CVAVBAPFreefieldAudioRenderer::GetSourcePosition(const CVAMotionState* pM
return VAVec3( vSoundSource.x, vSoundSource.y, vSoundSource.z );
}
#endif // (VACORE_WITH_RENDERER_VBAP_FREEFIELD==1)
#endif // ( VACORE_WITH_RENDERER_VBAP_FREEFIELD == 1 )
......@@ -2,12 +2,12 @@
#if (VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN==1 )
#include "VAHRIRDataset.h>
#include <Scene/VAListenerState.h>
#include <Scene/VAMotionState.h>
#include <Scene/VASceneState.h>
#include <Utils/VAUtils.h>
#include <VAHardwareSetup.h>
#include "../../Data/VAHRIRDataset.h"
#include "../../Scene/VAListenerState.h"
#include "../../Scene/VAMotionState.h"
#include "../../Scene/VASceneState.h"
#include "../../Utils/VAUtils.h"
#include "../../VAHardwareSetup.h"
#include <DSMBCConvolver.h>
#include <DSMBCFilterPool.h>
......@@ -22,7 +22,7 @@
#include <VistaBase/VistaVector3D.h>
#include <xutility>
#include <FastMath.h>
#include <ITAFastMath.h>
class CMixdownStreamFilter : public ITADatasourceRealization
{
......@@ -55,7 +55,7 @@ CVAAmbisonicsBinauralMixdownReproduction::CVAAmbisonicsBinauralMixdownReproducti
double dSampleRate = m_oParams.pCore->GetCoreConfig()->oAudioDriverConfig.dSamplerate;
int iBlockLength = oParams.pCore->GetCoreConfig()->oAudioDriverConfig.iBuffersize;
m_sfHRIRTemp.init( dSampleRate, 2, m_iHRIRFilterLength, true );
m_sfHRIRTemp.init( 2, m_iHRIRFilterLength, true );
// Binaural output
for( size_t i=0; i<m_oParams.vpOutputs.size(); i++ )
......@@ -184,7 +184,7 @@ void CVAAmbisonicsBinauralMixdownReproduction::UpdateScene( CVASceneState* pNewS
if( m_sfHRIRTemp.length() != iHRIRFilterLength )
{
double dSampleRate = m_oParams.pCore->GetCoreConfig()->oAudioDriverConfig.dSamplerate;
m_sfHRIRTemp.init( dSampleRate, 2, iHRIRFilterLength, false );
m_sfHRIRTemp.init( 2, iHRIRFilterLength, false );
}
int iIndex;
pHRIRSet->GetNearestNeighbour( float( dAzimuth ), float( dElevation ), &iIndex );
......
......@@ -3,9 +3,9 @@
#if ( VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN == 1 )
#include <Reproduction/VAAudioReproductionModule.h>
#include <Reproduction/VAAudioReproductionModuleRegistry.h>
#include <VACoreImpl.h>
#include "../VAAudioReproductionModule.h"
#include "../VAAudioReproductionModuleRegistry.h"
#include "../../VACoreImpl.h"
#include <ITASampleFrame.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment