Commit 880b81e2 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Adding profiling for stream detector performance, and switching default HRIR to new artificial head

parent 08c13c49
...@@ -56,7 +56,7 @@ voices_dir = data/Voices ...@@ -56,7 +56,7 @@ voices_dir = data/Voices
# Macros are substituted forwardly by key name order (use with care), otherwise stay untouched: A = B; C = $(A) -> $(C) is B # Macros are substituted forwardly by key name order (use with care), otherwise stay untouched: A = B; C = $(A) -> $(C) is B
DemoSound = WelcomeToVA.wav DemoSound = WelcomeToVA.wav
DefaultHRIR = ITA-Kunstkopf_5x5_256_44kHz.v17.ir.daff DefaultHRIR = ITA_Artificial_Head_5x5_44kHz_128.v17.ir.daff
HumanDir = Singer.v17.ms.daff HumanDir = Singer.v17.ms.daff
Trumpet = Trumpet1.v17.ms.daff Trumpet = Trumpet1.v17.ms.daff
......
...@@ -66,7 +66,7 @@ public: ...@@ -66,7 +66,7 @@ public:
inline ~CVAAudiostreamTracker() inline ~CVAAudiostreamTracker()
{ {
VA_VERBOSE( "AudioStreaming", "Processing time: " << m_swProcessingTime.ToString() << " avg DSP load = " << m_swProcessingTime.mean() * m_dSamplerate / m_uiBlocklength * 1e2 ); VA_VERBOSE( "AudioStreaming", "Processing time: " << m_swProcessingTime.ToString() << ", avg DSP load = " << m_swProcessingTime.mean() * m_dSamplerate / m_uiBlocklength * 1e2 << "%" );
} }
// Not thread safe, not reentrant safe // Not thread safe, not reentrant safe
......
...@@ -472,6 +472,7 @@ void CVACoreImpl::Initialize() { ...@@ -472,6 +472,7 @@ void CVACoreImpl::Initialize() {
{ {
m_pInputAmp = new ITAStreamAmplifier( pInputTail, ( float ) m_dInputGain ); m_pInputAmp = new ITAStreamAmplifier( pInputTail, ( float ) m_dInputGain );
m_pInputStreamDetector = new ITAStreamDetector( m_pInputAmp ); m_pInputStreamDetector = new ITAStreamDetector( m_pInputAmp );
m_pInputStreamDetector->SetProfilerEnabled( true );
pInputTail = m_pInputStreamDetector; pInputTail = m_pInputStreamDetector;
if( m_oCoreConfig.bRecordDeviceInputEnabled ) if( m_oCoreConfig.bRecordDeviceInputEnabled )
...@@ -536,6 +537,7 @@ void CVACoreImpl::Initialize() { ...@@ -536,6 +537,7 @@ void CVACoreImpl::Initialize() {
// Create output peak detector that uses patch bay output stream // Create output peak detector that uses patch bay output stream
m_pOutputStreamDetector = new ITAStreamDetector( m_pOutputPatchbay->GetOutputDatasource( iPhysicalHardwareOutput ) ); m_pOutputStreamDetector = new ITAStreamDetector( m_pOutputPatchbay->GetOutputDatasource( iPhysicalHardwareOutput ) );
m_pOutputStreamDetector->SetProfilerEnabled( true );
// Setup output dump (if set) // Setup output dump (if set)
...@@ -793,6 +795,9 @@ void CVACoreImpl::Finalize() ...@@ -793,6 +795,9 @@ void CVACoreImpl::Finalize()
delete m_pInputAmp; delete m_pInputAmp;
m_pInputAmp = nullptr; m_pInputAmp = nullptr;
if( m_pInputStreamDetector )
if( m_pInputStreamDetector->GetProfilerEnabled() )
VA_VERBOSE( "Core", "Input stream detector profiler: " << m_pInputStreamDetector->GetProfilerResult() );
delete m_pInputStreamDetector; delete m_pInputStreamDetector;
m_pInputStreamDetector = nullptr; m_pInputStreamDetector = nullptr;
...@@ -804,6 +809,8 @@ void CVACoreImpl::Finalize() ...@@ -804,6 +809,8 @@ void CVACoreImpl::Finalize()
delete m_pOutputPatchbay; delete m_pOutputPatchbay;
m_pOutputPatchbay = nullptr; m_pOutputPatchbay = nullptr;
if( m_pOutputStreamDetector->GetProfilerEnabled() )
VA_VERBOSE( "Core", "Output stream detector profiler: " << m_pOutputStreamDetector->GetProfilerResult() );
delete m_pOutputStreamDetector; delete m_pOutputStreamDetector;
m_pOutputStreamDetector = nullptr; m_pOutputStreamDetector = nullptr;
...@@ -888,7 +895,7 @@ void CVACoreImpl::GetModules( std::vector< CVAModuleInfo >& viModuleInfos ) cons ...@@ -888,7 +895,7 @@ void CVACoreImpl::GetModules( std::vector< CVAModuleInfo >& viModuleInfos ) cons
#endif // VACORE_MODULE_INTERFACE_ENABLED #endif // VACORE_MODULE_INTERFACE_ENABLED
} }
CVAStruct CVACoreImpl::CallModule( const std::string& sModuleName, const CVAStruct& oArgs ) CVAStruct CVACoreImpl::CallModule( const std::string& sModuleName, const CVAStruct& oArgs )
{ {
......
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