Finalizing renaming

parent 414d91c7
......@@ -12,9 +12,9 @@
#include <ITAUPFilter.h>
// Utils
#include "../Config/VAConfig.h"
#include "../VAConfig.h"
#include "VABinauralClustering.h"
#include "VABinauralClusterPoolFactory.h"
#include "VABinauralClusteringDirectionPoolFactory.h"
CVABinauralClustering::CVABinauralClustering()
{
......
......@@ -13,9 +13,9 @@
// Utils
#include "VABinauralClusteringDirection.h"
#include "VABinauralClusteringState.h"
#include "../BinauralListener/VABinauralListener.h"
#include "../BinauralSoundSource/VABinauralSoundSource.h"
#include "../BinauralTimeOfArrivalEstimator/VABinauralTOAEstimator.h"
#include "../VABinauralTOAEstimator.h"
#include "../Receiver/VABinauralClusteringDirectionReceiver.h"
#include "../WaveFront/VABinauralWaveFront.h"
//! Binaural clustering direction instance used for each binaural clustering direction receiver
/**
......
......@@ -5,7 +5,7 @@
#include "VABinauralClusteringDirection.h"
// VA includes
#include "../../../../../directivities/VADirectivityDAFFHRIR.h"
#include "../../../../directivities/VADirectivityDAFFHRIR.h"
// ITA includes
#include <ITAUPFilter.h>
......@@ -14,9 +14,9 @@
#include <ITAVariableDelayLine.h>
// Utils
#include "../Config/VAConfig.h"
#include "../RelationMetrics/VARelationMetrics.h"
#include "../BinauralTimeOfArrivalEstimator/VABinauralTOAEstimator.h"
#include "../VAConfig.h"
#include "../VARelationMetrics.h"
#include "../VABinauralTOAEstimator.h"
CVABinauralClusteringDirection::CVABinauralClusteringDirection()
: m_iLastHRIRIndex( -1 )
......@@ -94,7 +94,7 @@ ITASampleFrame* CVABinauralClusteringDirection::GetOutput()
// @todo use listener orientation (quaternion?) to roate the ears in the global coordinate systems
double toaHRTFChL = m_pClusteringDirectionReceiver->pTimeOfArrivalEstimator->getTOA( VAVec3( -1, 0, 0 ), v3ClusteringDirectionPos );
double toaHRTFChR = m_pClusteringDirectionReceiver->pTimeOfArrivalEstimator->getTOA( VAVec3( 1, 0, 0 ), v3ClusteringDirectionPos );
// Process binaural sound sources connected to this clustering direction
std::map< int, CVABinauralWaveFrontBase* >::const_iterator it;
for( it = m_mWaveFronts.begin(); it != m_mWaveFronts.end(); ++it )
......@@ -118,9 +118,9 @@ ITASampleFrame* CVABinauralClusteringDirection::GetOutput()
if( m_psfTempHRIR->GetLength() != iHRIRFilterLength )
m_psfTempHRIR->Init( 2, iHRIRFilterLength, false );
float fAzimuthDeg = oClusterSourceMetrics.phi * 180 / ITAConstants::PI_F;
float fElevationDeg = oClusterSourceMetrics.theta * 180 / ITAConstants::PI_F;
float fDistance = oClusterSourceMetrics.dist;
float fAzimuthDeg = ( float ) oClusterSourceMetrics.phi * 180 / ITAConstants::PI_F;
float fElevationDeg = ( float ) oClusterSourceMetrics.theta * 180 / ITAConstants::PI_F;
float fDistance = (float) oClusterSourceMetrics.dist;
int iIndex;
pHRIR->GetNearestNeighbour( fAzimuthDeg, fElevationDeg, &iIndex );
......
......@@ -8,8 +8,8 @@
#include <ITAUPConvolution.h>
// Utils
#include "../BinauralSoundSource/VABinauralSoundSource.h"
#include "../BinauralListener/VABinauralListener.h"
#include "../WaveFront/VABinauralWaveFront.h"
#include "../Receiver/VABinauralClusteringDirectionReceiver.h"
//! Class representing a binaural clustering direction that combines and processes multiple incident wave fronts in the sector of the direction
/**
......
#include "VABinauralClusterPoolFactory.h"
// Utils
#include "./VABinauralClusteringDirection.h"
#include "VABinauralClusteringDirectionPoolFactory.h"
#include "VABinauralClusteringDirection.h"
CVABinauralClusteringDirectionPoolFactory::CVABinauralClusteringDirectionPoolFactory()
{
......
......@@ -7,7 +7,7 @@
//! Clustering direction pool factory
/**
* @todo jst: rename soure and header file
*
*/
class CVABinauralClusteringDirectionPoolFactory : public IVAPoolObjectFactory
{
......
#include "VABinauralClusterEngine.h"
#include "VABinauralClusteringEngine.h"
#include "VABinauralClusteringPoolFactory.h"
// VA includes
#include <VAObjectPool.h>
// Utils
#include "./VABinauralClusteringPoolFactory.h">
CVABinauralClusteringEngine::CVABinauralClusteringEngine()
{
......@@ -45,8 +43,7 @@ void CVABinauralClusteringEngine::AddWaveFront( int sourceID, CVABinauralWaveFro
m_mCurrentWaveFronts.insert( std::pair< int, CVABinauralWaveFrontBase* >( sourceID, source ) );
}
void
CVABinauralClusteringEngine::RemoveWaveFront( int iID )
void CVABinauralClusteringEngine::RemoveWaveFront( int iID )
{
std::map< int, CVABinauralClustering* >::iterator it;
for( it = m_mClusteringInstances.begin(); it != m_mClusteringInstances.end(); ++it )
......
......@@ -5,10 +5,10 @@
#include <VA.h>
// Utils
#include "../BinauralListener/VABinauralListener.h"
#include "../BinauralSoundSource/VABinauralSoundSource.h"
#include "./VABinauralClustering.h"
#include "./VABinauralClusteringDirection.h"
#include "../Receiver/VABinauralClusteringDirectionReceiver.h"
#include "../WaveFront/VABinauralWaveFront.h"
#include "VABinauralClustering.h"
#include "VABinauralClusteringDirection.h"
//! Single managing instance that handles the entire clustering for all receivers
/**
......
......@@ -7,7 +7,6 @@
// Utils
#include "VABinauralClusteringState.h"
#include "./VABinauralClusterPoolFactory.h"
CVABinauralClusteringState::CVABinauralClusteringState(int numClusters, CVABinauralClusteringDirectionReceiver* listener, IVAObjectPool* pClusteringDirectionPool, std::map<int, ITAUPConvolution* > *FIRConvolversL, std::map<int, ITAUPConvolution* > *FIRConvolversR) :
......
......@@ -12,8 +12,8 @@
// Utils
#include "VABinauralClusteringDirection.h"
#include "../BinauralSoundSource/VABinauralSoundSource.h"
#include "../BinauralListener/VABinauralListener.h"
#include "../WaveFront/VABinauralWaveFront.h"
#include "../Receiver/VABinauralClusteringDirectionReceiver.h"
//! State of a clustering stage
class CVABinauralClusteringState
......
#include "VABinauralListener.h"
#include "VABinauralClusteringDirectionReceiver.h"
CVABinauralClusteringDirectionReceiver::CVABinauralClusteringDirectionReceiver( const CVACoreImpl* pCore, const Config& oConf )
......
......@@ -5,16 +5,16 @@
#include <VA.h>
#include <VAPoolObject.h>
#include "../../../../../core/core.h"
#include "../../../../../Motion/VAMotionModelBase.h"
#include "../../../../../Motion/VASharedMotionModel.h"
#include "../../../../../Scene/VAScene.h"
#include "../../../../core/core.h"
#include "../../../../Motion/VAMotionModelBase.h"
#include "../../../../Motion/VASharedMotionModel.h"
#include "../../../../Scene/VAScene.h"
// ITA includes
#include <ITASampleFrame.h>
// Utils
#include "../BinauralTimeOfArrivalEstimator/VABinauralTOAEstimator.h"
#include "../VABinauralTOAEstimator.h"
//! Binaural clustering direction receiver
// @todo jst: rename source files
......
#include "VABinauralListenerPoolFactory.h"
#include "VABinauralClusteringDirectionReceiverPoolFactory.h"
CVABinauralClusteringDirectionReceiverPoolFactory::CVABinauralClusteringDirectionReceiverPoolFactory( CVACoreImpl* pCore, const CVABinauralClusteringDirectionReceiver::Config& oConf )
: m_pCore( pCore )
......
......@@ -2,9 +2,7 @@
#define IW_VACORE_BINAURAL_CLUSTERING_DIRECTION_RECEIVER_POOL_FACTORY
// Utils
#include "./VABinauralListener.h"
// @todo jst: rename source files
#include "VABinauralClusteringDirectionReceiver.h"
class CVABinauralClusteringDirectionReceiverPoolFactory : public IVAPoolObjectFactory
{
......
......@@ -22,9 +22,9 @@
#include <ITAVariableDelayLine.h>
// Utils
#include "./Utils/Config/VAConfig.h"
#include "./Utils/BinauralListener/VABinauralListenerPoolFactory.h"
#include "./Utils/BinauralSoundSource/VABinauralSoundSourcePoolFactory.h"
#include "VAConfig.h"
#include "Receiver/VABinauralClusteringDirectionReceiverPoolFactory.h"
#include "WaveFront/VABinauralWaveFrontPoolFactory.h"
VABinauralClusteringRenderer::VABinauralClusteringRenderer( const CVAAudioRendererInitParams& oParams )
: ITADatasourceRealization( 2, oParams.pCore->GetCoreConfig()->oAudioDriverConfig.dSampleRate, oParams.pCore->GetCoreConfig()->oAudioDriverConfig.iBuffersize )
......
......@@ -9,9 +9,9 @@
#include <ITADataSourceRealization.h>
// Other
#include "./Utils/BinauralClusterEngine/VABinauralClusterEngine.h"
#include "./Utils/BinauralSoundSource/VABinauralSoundSource.h"
#include "./Utils/BinauralListener/VABinauralListener.h"
#include "Engine/VABinauralClusteringEngine.h"
#include "WaveFront/VABinauralWaveFront.h"
#include "Receiver/VABinauralClusteringDirectionReceiver.h"
//! A binaural renderer that handles clustering of incoming wave fronts (default: free-field conditions with one wave front per sound source)
/**
......
#include "VABinauralSoundSource.h"
#include "../RelationMetrics/VARelationMetrics.h"
#include "../Config/VAConfig.h"
#include "VABinauralWaveFront.h"
#include "../VARelationMetrics.h"
#include "../VAConfig.h"
#include <ITAVariableDelayLine.h>
#include <ITASampleBuffer.h>
......@@ -8,8 +8,8 @@
CVABinauralWaveFrontBase::CVABinauralWaveFrontBase( const Config& conf )
: oConf( conf )
{
vdlChL = new CITAVariableDelayLine( conf.sampleRate, conf.blockLength, 3. * conf.sampleRate, CITAVariableDelayLine::CUBIC_SPLINE_INTERPOLATION );
vdlChR = new CITAVariableDelayLine( conf.sampleRate, conf.blockLength, 3. * conf.sampleRate, CITAVariableDelayLine::CUBIC_SPLINE_INTERPOLATION );
vdlChL = new CITAVariableDelayLine( conf.sampleRate, conf.blockLength, (const float)( 3. * conf.sampleRate ), CITAVariableDelayLine::CUBIC_SPLINE_INTERPOLATION );
vdlChR = new CITAVariableDelayLine( conf.sampleRate, conf.blockLength, (const float)( 3. * conf.sampleRate ), CITAVariableDelayLine::CUBIC_SPLINE_INTERPOLATION );
}
CVABinauralWaveFrontBase::~CVABinauralWaveFrontBase()
......@@ -54,7 +54,7 @@ void CVABinauralWaveFrontBase::GetOutput( ITASampleBuffer* pfLeftChannel, ITASam
VARelationMetrics sourceMetrics;
sourceMetrics.calc( m_v3PredictedClusteringPos, m_v3PredictedClusteringView, m_v3PredictedClusteringUp, v3PredictedPos );
double toaDistance = sourceMetrics.dist / 343; // TODO: get sound speed from core homogeneous medium
//double toaDistance = sourceMetrics.dist / 343; // TODO: get sound speed from core homogeneous medium
//double toaSourceChL = _listener->toaEstimator->getTOALeft(sourceMetrics.phi, sourceMetrics.theta);
//double toSourceaChR = _listener->toaEstimator->getTOARight(sourceMetrics.phi, sourceMetrics.theta);
......
......@@ -5,9 +5,9 @@
#include <VA.h>
#include <VAPoolObject.h>
#include "../../../../../Motion/VAMotionModelBase.h"
#include "../../../../../Motion/VASharedMotionModel.h"
#include "../../../../../Scene/VAScene.h"
#include "../../../../Motion/VAMotionModelBase.h"
#include "../../../../Motion/VASharedMotionModel.h"
#include "../../../../Scene/VAScene.h"
class ITASampleBuffer;
class CITAVariableDelayLine;
......
#include "VABinauralSoundSourcePoolFactory.h"
#include "VABinauralWaveFrontPoolFactory.h"
VABinauralSoundSourcePoolFactory::VABinauralSoundSourcePoolFactory(CVABinauralWaveFrontBase::Config conf) :
_conf(conf)
VABinauralSoundSourcePoolFactory::VABinauralSoundSourcePoolFactory( CVABinauralWaveFrontBase::Config oConf ) :
m_oConf( oConf )
{
}
VABinauralSoundSourcePoolFactory::~VABinauralSoundSourcePoolFactory()
{
}
CVAPoolObject*
VABinauralSoundSourcePoolFactory::CreatePoolObject()
CVAPoolObject* VABinauralSoundSourcePoolFactory::CreatePoolObject()
{
return new CVABinauralWaveFrontBase(_conf);
};
\ No newline at end of file
return new CVABinauralWaveFrontBase( m_oConf );
}
#ifndef IW_VACORE_BINAURALSOUNDSOURCEPOOLFACTORY
#define IW_VACORE_BINAURALSOUNDSOURCEPOOLFACTORY
#ifndef IW_VACORE_BINAURAL_WAVE_FRONT_POOL_FACTORY
#define IW_VACORE_BINAURAL_WAVE_FRONT_POOL_FACTORY
// Utils
#include "VABinauralSoundSource.h"
#include "VABinauralWaveFront.h"
class VABinauralSoundSourcePoolFactory : public IVAPoolObjectFactory
{
public:
VABinauralSoundSourcePoolFactory(CVABinauralWaveFrontBase::Config conf);
VABinauralSoundSourcePoolFactory( CVABinauralWaveFrontBase::Config oConf );
~VABinauralSoundSourcePoolFactory();
CVAPoolObject*
VABinauralSoundSourcePoolFactory::CreatePoolObject();
CVAPoolObject* VABinauralSoundSourcePoolFactory::CreatePoolObject();
private:
const CVABinauralWaveFrontBase::Config _conf;
const CVABinauralWaveFrontBase::Config m_oConf;
};
#endif // IW_VACORE_BINAURALSOUNDSOURCEPOOLFACTORY
#endif // IW_VACORE_BINAURAL_WAVE_FRONT_POOL_FACTORY
Markdown is supported
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