Intermediate checkin while moving files

parent 7e95613c
......@@ -198,12 +198,30 @@ UpdateRateER = 4.2
UpdateRateDD = 0.08
DirectSoundPowerCorrectionFactor = 0.05
[Renderer:MyBinauralFreeFieldClustering]
Enabled = false
Class = BinauralClustering
Reproductions = MyTalkthroughHeadphones
OutputDetectorEnabled = false
RecordOutputEnabled = false
RecordOutputFileName = renderer_out.wav
RecordOutputBaseFolder = recordings/$(ProjectName)/renderer/MyBinauralClustering
HRIRFilterLength = 256
MotionModelNumHistoryKeys = 10000
MotionModelWindowSize = 0.4
MotionModelWindowDelay = 0.2
MotionModelLogInputSources = false
MotionModelLogEstimatedOutputSources = false
MotionModelLogInputListener = false
MotionModelLogEstimatedOutputListener = false
SwitchingAlgorithm = linear
[Renderer:MyPrototypeFreeField]
Class = PrototypeFreeField
Enabled = false
Reproductions = MyTalkthroughHeadphones
MotionModelNumHistoryKeys = 10000
MotionModelWindowSize = 0.2
MotionModelWindowSize = 0.1
MotionModelWindowDelay = 0.1
MotionModelLogInputSources = false
MotionModelLogEstimatedOutputSources = false
......
#include "VABinauralRealTimeRenderer.h"
#include "VABinauralClusteringRenderer.h"
#include <iostream>
#include <fstream>
......@@ -26,7 +26,7 @@
#include "./Utils/BinauralListener/VABinauralListenerPoolFactory.h"
#include "./Utils/BinauralSoundSource/VABinauralSoundSourcePoolFactory.h"
VABinauralRealTimeRenderer::VABinauralRealTimeRenderer( const CVAAudioRendererInitParams& params )
VABinauralClusteringRenderer::VABinauralClusteringRenderer( const CVAAudioRendererInitParams& params )
: ITADatasourceRealization( 2, params.pCore->GetCoreConfig()->oAudioDriverConfig.dSampleRate, params.pCore->GetCoreConfig()->oAudioDriverConfig.iBuffersize )
, _params( params )
, _core( params.pCore )
......@@ -46,11 +46,11 @@ VABinauralRealTimeRenderer::VABinauralRealTimeRenderer( const CVAAudioRendererIn
_curGlobalAuralizationMode = IVAInterface::VA_AURAMODE_DEFAULT;
}
VABinauralRealTimeRenderer::~VABinauralRealTimeRenderer()
VABinauralClusteringRenderer::~VABinauralClusteringRenderer()
{
}
void VABinauralRealTimeRenderer::init( const CVAStruct& oArgs )
void VABinauralClusteringRenderer::init( const CVAStruct& oArgs )
{
CVAConfigInterpreter conf( oArgs );
......@@ -113,17 +113,17 @@ void VABinauralRealTimeRenderer::init( const CVAStruct& oArgs )
_clusterEngine = new VABinauralClusterEngine();
}
void VABinauralRealTimeRenderer::Reset()
void VABinauralClusteringRenderer::Reset()
{
VA_ERROR( "BinauralRealTimeRenderer", "Reset hast not yet been implemented" );
VA_ERROR( "BinauralClusteringRenderer", "Reset hast not yet been implemented" );
}
ITADatasource* VABinauralRealTimeRenderer::GetOutputDatasource()
ITADatasource* VABinauralClusteringRenderer::GetOutputDatasource()
{
return this;
}
void VABinauralRealTimeRenderer::UpdateGlobalAuralizationMode( int iGlobalAuralizationMode )
void VABinauralClusteringRenderer::UpdateGlobalAuralizationMode( int iGlobalAuralizationMode )
{
if( _curGlobalAuralizationMode == iGlobalAuralizationMode )
return;
......@@ -134,7 +134,7 @@ void VABinauralRealTimeRenderer::UpdateGlobalAuralizationMode( int iGlobalAurali
}
void
VABinauralRealTimeRenderer::ProcessStream( const ITAStreamInfo* streamInfo )
VABinauralClusteringRenderer::ProcessStream( const ITAStreamInfo* streamInfo )
{
#ifdef BINAURAL_CLUSTERING_RENDERER_WITH_BENCHMARKING
......@@ -194,7 +194,7 @@ VABinauralRealTimeRenderer::ProcessStream( const ITAStreamInfo* streamInfo )
return;
}
void VABinauralRealTimeRenderer::UpdateScene( CVASceneState* newSceneState )
void VABinauralClusteringRenderer::UpdateScene( CVASceneState* newSceneState )
{
assert( newSceneState );
......@@ -254,7 +254,7 @@ void VABinauralRealTimeRenderer::UpdateScene( CVASceneState* newSceneState )
}
void VABinauralRealTimeRenderer::updateSources( CVASceneStateDiff* diff )
void VABinauralClusteringRenderer::updateSources( CVASceneStateDiff* diff )
{
typedef std::vector< int >::const_iterator icit_t;
......@@ -312,7 +312,7 @@ void VABinauralRealTimeRenderer::updateSources( CVASceneStateDiff* diff )
}
}
void VABinauralRealTimeRenderer::updateListeners( CVASceneStateDiff* diff )
void VABinauralClusteringRenderer::updateListeners( CVASceneStateDiff* diff )
{
typedef std::vector< int >::const_iterator icit_t;
......@@ -368,7 +368,7 @@ void VABinauralRealTimeRenderer::updateListeners( CVASceneStateDiff* diff )
}
}
void VABinauralRealTimeRenderer::createSource( const int sourceID, const CVASoundSourceState* sourceState )
void VABinauralClusteringRenderer::createSource( const int sourceID, const CVASoundSourceState* sourceState )
{
VABinauralSoundSource* source = dynamic_cast< VABinauralSoundSource* >( _sourcePool->RequestObject() ); // Reference = 1
......@@ -390,7 +390,7 @@ void VABinauralRealTimeRenderer::createSource( const int sourceID, const CVASoun
_clusterEngine->addSource( sourceID, source );
}
void VABinauralRealTimeRenderer::deleteSource( int sourceID )
void VABinauralClusteringRenderer::deleteSource( int sourceID )
{
// remove local source reference
std::map< int, VABinauralSoundSource* >::iterator it = _sources.find( sourceID );
......@@ -402,7 +402,7 @@ void VABinauralRealTimeRenderer::deleteSource( int sourceID )
source->RemoveReference();
}
void VABinauralRealTimeRenderer::createListener( int listenerID, const CVAReceiverState* recevierState )
void VABinauralClusteringRenderer::createListener( int listenerID, const CVAReceiverState* recevierState )
{
VABinauralListener* listener = dynamic_cast< VABinauralListener* >( _listenerPool->RequestObject() ); // Reference = 1
......@@ -426,7 +426,7 @@ void VABinauralRealTimeRenderer::createListener( int listenerID, const CVAReceiv
_clusterEngine->addListener( listenerID, listener, config );
}
void VABinauralRealTimeRenderer::deleteListener( int listenerID )
void VABinauralClusteringRenderer::deleteListener( int listenerID )
{
// remove local listener reference
std::map< int, VABinauralListener* >::iterator it = _listeners.find( listenerID );
......@@ -442,7 +442,7 @@ void VABinauralRealTimeRenderer::deleteListener( int listenerID )
}
void VABinauralRealTimeRenderer::updateMotionStates()
void VABinauralClusteringRenderer::updateMotionStates()
{
// Neue Quellendaten bernehmen
for( std::map< int, VABinauralSoundSource* >::iterator it = _sources.begin(); it != _sources.end(); ++it )
......@@ -464,7 +464,7 @@ void VABinauralRealTimeRenderer::updateMotionStates()
}
}
void VABinauralRealTimeRenderer::updateTrajectories( double time )
void VABinauralClusteringRenderer::updateTrajectories( double time )
{
for( auto const& sourceIt : _sources )
{
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/RealTime" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\RealTime" )
set( RelativeDir "src/Rendering/Binaural/Clustering" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\Clustering" )
set( SubDirs Utils )
set( DirFiles
VABinauralRealTimeRenderer.cpp
VABinauralRealTimeRenderer.h
VABinauralClusteringRenderer.cpp
VABinauralClusteringRenderer.h
_SourceFiles.cmake
)
......
......@@ -21,7 +21,7 @@
#include "Binaural/ArtificialReverb/VABinauralArtificialReverb.h"
#include "Binaural/FreeField/VABinauralFreefieldAudioRenderer.h"
#include "Binaural/RoomAcoustics/VARoomAcousticsAudioRenderer.h"
#include "Binaural/RealTime/VABinauralRealTimeRenderer.h"
#include "Binaural/Clustering/VABinauralClusteringRenderer.h"
#include "Prototyping/FreeField/VAPrototypeFreeFieldAudioRenderer.h"
#include "Prototyping/Dummy/VAPTDummyAudioRenderer.h"
......@@ -111,7 +111,7 @@ void CVAAudioRendererRegistry::RegisterInternalCoreFactoryMethods()
#ifdef VACORE_WITH_RENDERER_BINAURAL_REAL_TIME
RegisterRendererDefaultFactory< VABinauralRealTimeRenderer>("BinauralRealTime");
RegisterRendererDefaultFactory< VABinauralClusteringRenderer>("BinauralClustering");
#endif // VACORE_WITH_RENDERER_BINAURAL_REAL_TIME
......
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