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

Better outputs in HOA and Core on listener/source creation

parent f9178ed0
......@@ -52,6 +52,8 @@ CVAAmbisonicsReproduction::CVAAmbisonicsReproduction( const CVAAudioReproduction
{
//Mittelpunkt aus der ersten LS Configuration berechnen
m_vpTargetOutputs[0];
VA_EXCEPT2(NOT_IMPLEMENTED, "Automatic reproduction center calculation not implemented, please provide 3-dim vector with key 'ReproductionCenterPos' in reproduction configuration");
}
else
{
......@@ -74,7 +76,7 @@ void CVAAmbisonicsReproduction::SetInputDatasource( ITADatasource* p )
m_pDecoderMatrixPatchBay->AddInput( p );
int iNumConfiguredAmbisonicsChannels = ( m_iAmbisonicsTruncationOrder + 1 ) * ( m_iAmbisonicsTruncationOrder + 1 );
if( GetNumInputChannels() != p->GetNumberOfChannels() )
if( GetNumInputChannels() != int( p->GetNumberOfChannels() ) )
VA_WARN( "AmbisonicsReproduction", "Ambisonics order missmatch in renderer and reproduction modules, truncating higher orders" );
int iMaxPossibleAmbisonicsChannelNumber = min( int( p->GetNumberOfChannels() ), iNumConfiguredAmbisonicsChannels );
......@@ -111,9 +113,9 @@ void CVAAmbisonicsReproduction::SetInputDatasource( ITADatasource* p )
double dElevation = GetAzimuthOnTarget_DEG( m_v3ReproductionCenterPos, v3ViewDummy, v3UpDummy, v3LSPos );
// todo calculate gain @mko
if ( j==0 && k==0 )
VA_WARN("AmbisonicsReproduction", "No dynamic HOA matrix calculation based on LS configuration available, using pre-calculated matrix for ITA VR lab");
double dGain = dYInv[j][k]; // TEMP use static gain from matrix
m_pDecoderMatrixPatchBay->ConnectChannels( 0, int( j ), 0, int( k ), dGain );
......@@ -135,9 +137,10 @@ int CVAAmbisonicsReproduction::GetNumInputChannels() const
return ( m_iAmbisonicsTruncationOrder + 1 ) * ( m_iAmbisonicsTruncationOrder + 1 );
}
void CVAAmbisonicsReproduction::UpdateScene( CVASceneState* pNewState )
void CVAAmbisonicsReproduction::UpdateScene( CVASceneState* )
{
// There is no need for dynamic modification of the ambisonics reproduction
return;
}
#endif // VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN
\ No newline at end of file
#endif // VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN
......@@ -1916,7 +1916,7 @@ int CVACoreImpl::CreateSoundSource( const std::string& sName, int iAuralizationM
if( !bInSyncMode )
UnlockScene();
VA_VERBOSE( "Core", "Created sound source (ID=" << iSourceID << ", Name=\"" << sName << "\", AMode=" << IVACore::GetAuralizationModeStr( iAuralizationMode, true ) << ", Volume=" << IVACore::GetVolumeStrDecibel( dVolume ) << ")" );
VA_INFO("Core", "Created sound source '" << sName << "' and assigned ID " << iSourceID);
return iSourceID;
}
......@@ -1974,7 +1974,7 @@ int CVACoreImpl::CreateSoundSourceExplicitRenderer( const std::string& sName, co
if( !bSync )
UnlockScene();
VA_INFO( "Core", "Created sound source (ID=" << iSourceID << ", Name=\"" << sName << "\") explicitly for renderer '" << sRendererID << "' only" );
VA_INFO("Core", "Created listener '" << sName << "' and assigned ID " << iSourceID << " explicitly for renderer '" << sRendererID << "' only" );
return iSourceID;
}
......@@ -2853,9 +2853,7 @@ int CVACoreImpl::CreateListener( const std::string& sName, int iAuralizationMode
if( !bSync )
UnlockScene();
VA_INFO( "Core", "Created listener (ID=" << iListenerID << ", Name=\"" << sName
<< "\", AMode=" << IVACore::GetAuralizationModeStr( iAuralizationMode, true ) << ", HRIR="
<< iHRIRDatasetID << ")" );
VA_INFO("Core", "Created listener '" << sName << "' and assigned ID " << iListenerID);
return iListenerID;
......
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