Skip to content
GitLab
Commit 0a931843 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Improved VA-wide output formatting, and adding more versatile information on... 

Improved VA-wide output formatting, and adding more versatile information on core initialization (renderers, reproductions)
parent 72abc021
Show whitespace changes
Inline Side-by-side
src/Audiosignals/VAAudiofileSignalSource.cpp
View file @ 0a931843
......@@ -94,10 +94,10 @@ void CVAAudiofileSignalSource::SetPlaybackAction( int iPlayStateAction )
m_iRequestedPlaybackAction = iPlayStateAction;
break;
case IVACore::VA_PLAYBACK_ACTION_NONE:
VA_WARN( "CVAAudiofileSignalSource", "Ignoring playback action '" << iPlayStateAction << "' (NONE)" );
VA_WARN( "AudiofileSignalSource", "Ignoring playback action '" << iPlayStateAction << "' (NONE)" );
break;
default:
VA_ERROR( "CVAAudiofileSignalSource", "Could not apply unkown playback action '" << iPlayStateAction << "'" );
VA_ERROR( "AudiofileSignalSource", "Could not apply unkown playback action '" << iPlayStateAction << "'" );
break;
}
......@@ -248,7 +248,7 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
if( m_pBufferDataSource->GetLoopMode() == false )
{
m_iCurrentPlayState = IVACore::VA_PLAYBACK_STATE_STOPPED; // Attention, directly modifying member, only OK here.
VA_INFO( "CVAAudiofileSignalSource", "Playback stop transition forced during locked scene." );
VA_INFO( "AudiofileSignalSource", "Playback stop transition forced during locked scene." );
}
}
break;
......@@ -313,7 +313,7 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
if( m_iCurrentPlayState != iNewPlaybackState && !bSyncMod )
{
VA_INFO( "CVAAudiofileSignalSource", "Playback transition from '" << GetStateString( m_iCurrentPlayState ) << "'" <<
VA_INFO( "AudiofileSignalSource", "Playback transition from '" << GetStateString( m_iCurrentPlayState ) << "'" <<
" to '" << GetStateString( iNewPlaybackState ) << "'" );
assert( iNewPlaybackState != IVACore::VA_PLAYBACK_STATE_INVALID );
......
src/Audiosignals/VAMachineSignalSource.cpp
View file @ 0a931843
......@@ -216,7 +216,7 @@ const float* CVAMachineSignalSource::GetStreamBlock( const CVAAudiostreamState*
for( int i=0; i<m_sbOut.length(); i++ )
{
if( m_sbOut[i] > 1.0f || m_sbOut[i] < -1.0f )
VA_WARN( "CVAMachineSignalSource", "high energy detected" );
VA_WARN( "MachineSignalSource", "high energy detected" );
}
return m_sbOut.data();
......
src/Audiosignals/VATextToSpeechSignalSource.cpp
View file @ 0a931843
......@@ -83,7 +83,7 @@ const float* CVATextToSpeechSignalSource::GetStreamBlock( const CVAAudiostreamSt
delete m_pFrameToDelete;
m_pFrameToDelete = NULL;
}
//VA_INFO("CVATextToSpeechSignalSource", "TTS to VA_PLAYBACK_ACTION_STOP");
//VA_INFO("TextToSpeechSignalSource", "TTS to VA_PLAYBACK_ACTION_STOP");
}
}
......@@ -124,7 +124,7 @@ std::string CVATextToSpeechSignalSource::GetStateString() const
void CVATextToSpeechSignalSource::Reset()
{
VA_WARN("CVATextToSpeechSignalSource", "Reset is not yet implemented.");
VA_WARN("TextToSpeechSignalSource", "Reset is not yet implemented.");
}
CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) const
......@@ -134,7 +134,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c
#ifndef VACORE_WITH_TTS_SIGNAL_SOURCE
oRet[ "error" ] = "TTS signal sources not activated in your VACore";
VA_WARN( "CVATextToSpeechSignalSource", "TTS signal sources was requested but is not activated in your VACore" );
VA_WARN( "TextToSpeechSignalSource", "TTS signal sources was requested but is not activated in your VACore" );
#else
/*
......@@ -146,7 +146,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c
auto it = m_Visemes.find(id);
if (it == m_Visemes.end()){
VA_WARN("CVATextToSpeechSignalSource", "Visemes for requested id \"" + id + "\" do not exist.");
VA_WARN("TextToSpeechSignalSource", "Visemes for requested id \"" + id + "\" do not exist.");
oRet["visemes"] = "";
return oRet;
}
......@@ -187,12 +187,12 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c
if (oArgs.IsEmpty())
{
oRet["info"] = "see VATextToSpeechSignalSource.h documentation for SetParameters() for usage information";
VA_INFO("CVATextToSpeechSignalSource", "GetParameters called with empty argument, see VATextToSpeechSignalSource.h documentation for SetParameters() for usage information.");
VA_INFO("TextToSpeechSignalSource", "GetParameters called with empty argument, see VATextToSpeechSignalSource.h documentation for SetParameters() for usage information.");
return oRet;
}
oRet["info"] = "Unknown parameters! see VATextToSpeechSignalSource.h documentation for SetParameters() for usage information";
VA_INFO("CVATextToSpeechSignalSource", "Unknonwn parameters: " + oArgs.ToString());
VA_INFO("TextToSpeechSignalSource", "Unknonwn parameters: " + oArgs.ToString());
#endif
return oRet;
......@@ -201,7 +201,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c
void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
{
#ifndef VACORE_WITH_TTS_SIGNAL_SOURCE
VA_WARN( "CVATextToSpeechSignalSource", "TTS signal sources was requested but is not activated in your VACore" );
VA_WARN( "TextToSpeechSignalSource", "TTS signal sources was requested but is not activated in your VACore" );
#else
/*
......@@ -210,7 +210,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
if (oParams.HasKey("prepare_text")){
if (!oParams["prepare_text"].IsString()){
VA_WARN("CVATextToSpeechSignalSource", "No Text given!");
VA_WARN("TextToSpeechSignalSource", "No Text given!");
return;
}
std::string sText = oParams["prepare_text"];
......@@ -227,7 +227,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
std::string id = "tmp";
if (!oParams.HasKey("id") || !oParams["id"].IsString()){
if (!direct_playback){
VA_WARN("CVATextToSpeechSignalSource", "No id is given for the prepare speech request, the user application has to give an unique id.");
VA_WARN("TextToSpeechSignalSource", "No id is given for the prepare speech request, the user application has to give an unique id.");
return;
}
}
......@@ -235,7 +235,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
id = oParams["id"];
if (m_Visemes.find(id) != m_Visemes.end() && id.compare("tmp")!=0){
VA_WARN("CVATextToSpeechSignalSource", "The id \""+id+"\" was used before, make sure you do not overwrite anything still needed.");
VA_WARN("TextToSpeechSignalSource", "The id \""+id+"\" was used before, make sure you do not overwrite anything still needed.");
}
......@@ -257,7 +257,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
#endif
CPRC_abuf* buf = CPRCEN_engine_channel_speak(TTSEngine::getInstance().getEngine(), chan, sText.c_str(), sText.length(), true);
if (buf == NULL){
VA_WARN("CVATextToSpeechSignalSource", "Cannot create an audio file, probably no voice is available!");
VA_WARN("TextToSpeechSignalSource", "Cannot create an audio file, probably no voice is available!");
return;
}
......@@ -292,7 +292,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
SetParameters(oParams_play);
}
VA_INFO("CVATextToSpeechSignalSource", "VA creatted audio, to say \"" + sText + "\", with id: \"" + id + "\"");
VA_INFO("TextToSpeechSignalSource", "VA creatted audio, to say \"" + sText + "\", with id: \"" + id + "\"");
return;
}
......@@ -309,7 +309,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
if (oParams["play_speech"].IsString())
id = oParams["play_speech"];
else
VA_WARN("CVATextToSpeechSignalSource", "play_speech does not hold an identificator for the speech to be played, use \"tmp\"");
VA_WARN("TextToSpeechSignalSource", "play_speech does not hold an identificator for the speech to be played, use \"tmp\"");
//pAudioFile = new CVAAudiofileSignalSource("D:/work/tts.wav", GetSampleRate(), GetBlocklength());
//pAudioFile->SetIsLooping(true);
......@@ -326,7 +326,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
auto it = m_AudioSampleFrames.find(id);
if (it == m_AudioSampleFrames.end() || it->second==NULL){
VA_WARN("CVATextToSpeechSignalSource", "There is no audio created for id: \"" + id + "\"");
VA_WARN("TextToSpeechSignalSource", "There is no audio created for id: \"" + id + "\"");
return;
}
......@@ -349,12 +349,12 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
m_Visemes[id] = "";
}
VA_INFO("CVATextToSpeechSignalSource", "Play TTS for id: \"" + id + "\"");
VA_INFO("TextToSpeechSignalSource", "Play TTS for id: \"" + id + "\"");
return;
}
VA_WARN( "CVATextToSpeechSignalSource", "Could not interpret parameters for text-to-speech signal source setter method, use empty getter for help." );
VA_WARN( "TextToSpeechSignalSource", "Could not interpret parameters for text-to-speech signal source setter method, use empty getter for help." );
#endif
}
......@@ -376,12 +376,12 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user
float endTime = 0.0f;
if (abuf == NULL){
VA_WARN("CVATextToSpeechSignalSource", "The buffer is NULL, cannot extract visemes!");
VA_WARN("TextToSpeechSignalSource", "The buffer is NULL, cannot extract visemes!");
return;
}
if (userdata == NULL){
VA_WARN("CVATextToSpeechSignalSource", "The userdata viseme string is NULL, cannot extract visemes!");
VA_WARN("TextToSpeechSignalSource", "The userdata viseme string is NULL, cannot extract visemes!");
return;
}
......@@ -397,7 +397,7 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user
end = CPRC_abuf_trans_end(trans); /* End time in seconds */
label = CPRC_abuf_trans_name(trans); /* Label, type dependent */
if (CPRC_abuf_trans_type(trans) == CPRC_ABUF_TRANS_PHONE) {
//VA_INFO("CVATextToSpeechSignalSource", "Phoneme: " + std::to_string(start) + " " + std::to_string(end) + " " + label);
//VA_INFO("TextToSpeechSignalSource", "Phoneme: " + std::to_string(start) + " " + std::to_string(end) + " " + label);
//visemes_time->first.append( "\t<viseme start=\"" + to_string_with_precision(start+visemes_time->second) + "\" articulation=\"1\" type=\"" + PhonemeToViseme(label) + "\" />\n");
std::string viseme = std::string("\t<lips ")
+ "viseme=\"" + TTSEngine::getInstance().PhonemeToViseme(label) + "\" "
......@@ -411,13 +411,13 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user
endTime = end;
}
/*else if (CPRC_abuf_trans_type(trans) == CPRC_ABUF_TRANS_WORD) {
VA_INFO("CVATextToSpeechSignalSource", "Word: " + std::to_string(start) + " " + std::to_string(end) + " " + label);
VA_INFO("TextToSpeechSignalSource", "Word: " + std::to_string(start) + " " + std::to_string(end) + " " + label);
}
else if (CPRC_abuf_trans_type(trans) == CPRC_ABUF_TRANS_MARK) {
VA_INFO("CVATextToSpeechSignalSource", "Marker: " + std::to_string(start) + " " + std::to_string(end) + " " + label);
VA_INFO("TextToSpeechSignalSource", "Marker: " + std::to_string(start) + " " + std::to_string(end) + " " + label);
}*/
else if (CPRC_abuf_trans_type(trans) == CPRC_ABUF_TRANS_ERROR) {
VA_INFO("CVATextToSpeechSignalSource", "ERROR: could not retrieve transcription at "+ std::to_string(i));
VA_INFO("TextToSpeechSignalSource", "ERROR: could not retrieve transcription at "+ std::to_string(i));
}
}
data->lastEnd = endTime;
......@@ -444,11 +444,11 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){
SetAdditionalVoicePath(CEREVOICE_VOICES_PATH);//this is defined by the FindVCereVoice cmake script, but cannot be used e.g. for deployed VAServers
for (std::string voices_path : m_VoicePaths){
VA_INFO("CVATextToSpeechSignalSource", "CereVoice voices are searched in \"" + voices_path + "\"");
VA_INFO("TextToSpeechSignalSource", "CereVoice voices are searched in \"" + voices_path + "\"");
VistaFileSystemDirectory voicesDir(voices_path);
if (!voicesDir.Exists()){
VA_WARN("CVATextToSpeechSignalSource", "The voices directory does not exist!");
VA_WARN("TextToSpeechSignalSource", "The voices directory does not exist!");
continue;
}
......@@ -460,11 +460,11 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){
std::string licence_file = name.substr(0, suffix_pos) + ".lic";
VistaFileSystemFile licenseFile(licence_file);
if (!licenseFile.Exists()){
VA_WARN("CVATextToSpeechSignalSource", "The associated license file ("+licence_file+") does not exist, cannot load voice");
VA_WARN("TextToSpeechSignalSource", "The associated license file ("+licence_file+") does not exist, cannot load voice");
continue;
}
CPRCEN_engine_load_voice(m_pTTSEngine, licence_file.c_str(), NULL, name.c_str(), CPRC_VOICE_LOAD);
VA_INFO("CVATextToSpeechSignalSource", "Loaded voice \"" + name + "\"");
VA_INFO("TextToSpeechSignalSource", "Loaded voice \"" + name + "\"");
}
}
......@@ -472,7 +472,7 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){
m_sampleRate = -1.0;
int num_voices = CPRCEN_engine_get_voice_count(getEngine());
if (num_voices == 0){
VA_WARN("CVATextToSpeechSignalSource", "No voices were loaded!!!!! TTS will not work!!!!!");
VA_WARN("TextToSpeechSignalSource", "No voices were loaded!!!!! TTS will not work!!!!!");
}
for (int i = 0; i < num_voices; i++) {
std::string strSamplerate = CPRCEN_engine_get_voice_info(getEngine(), i, "SAMPLE_RATE");
......@@ -480,7 +480,7 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){
if (m_sampleRate < 0.0)
m_sampleRate = rate;
if (rate != m_sampleRate)
VA_WARN("CVATextToSpeechSignalSource", "Voices with different sample rates are used namely "+std::to_string(rate)+" and "+std::to_string(m_sampleRate));
VA_WARN("TextToSpeechSignalSource", "Voices with different sample rates are used namely "+std::to_string(rate)+" and "+std::to_string(m_sampleRate));
}
SetupPhonemeMapping();
......@@ -512,13 +512,13 @@ std::string CVATextToSpeechSignalSource::TTSEngine::PhonemeToViseme(std::string
auto it = m_phonemeToId.find(phoneme);
if (it == m_phonemeToId.end()){
VA_WARN("CVATextToSpeechSignalSource", "There exists no mapping for the phoneme: \"" + phoneme + "\"");
VA_WARN("TextToSpeechSignalSource", "There exists no mapping for the phoneme: \"" + phoneme + "\"");
return phoneme;
}
auto it2 = m_idToViseme.find(it->second);
if (it2 == m_idToViseme.end()){
VA_WARN("CVATextToSpeechSignalSource", "There exists no mapping for viseme id: " + it->second);
VA_WARN("TextToSpeechSignalSource", "There exists no mapping for viseme id: " + it->second);
return phoneme;
}
return it2->second;
......
src/Data/VAHRIRDatasetDAFF2D.cpp
View file @ 0a931843
......@@ -192,7 +192,7 @@ void CVAHRIRDatasetDAFF2D::GetHRIRByIndex(ITASampleFrame* psfDest,
assert( m_pContent );
if (psfDest->channels() > m_pReader->getProperties()->getNumberOfChannels())
VA_EXCEPT1(std::string("CVAHRIRDatasetDAFF2D::GetHRIRByIndex - Target SampleFrame contains more channels than HRIR database"));
VA_EXCEPT1(std::string("HRIRDatasetDAFF2D::GetHRIRByIndex - Target SampleFrame contains more channels than HRIR database"));
int iResult;
for (int iChan=0;iChan<psfDest->channels();iChan++)
......
src/Rendering/Binaural/AirTrafficNoise/VAAirTrafficNoiseAudioRenderer.cpp
View file @ 0a931843
......@@ -830,7 +830,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::UpdateTrajectories()
if( pMotionNew && ( pMotionNew != pMotionCur ) )
{
VA_TRACE( "CVABinauralAirTrafficNoiseAudioRenderer", "Source " << iSourceID << " new motion state" );
VA_TRACE( "BinauralAirTrafficNoiseAudioRenderer", "Source " << iSourceID << " new motion state" );
pSource->pMotionModel->InputMotionKey( pMotionNew );
}
}
......@@ -849,7 +849,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::UpdateTrajectories()
if( pMotionNew && ( pMotionNew != pMotionCur ) )
{
VA_TRACE( "CVABinauralAirTrafficNoiseAudioRenderer", "Listener " << iListenerID << " new position " );// << *pMotionNew);
VA_TRACE( "BinauralAirTrafficNoiseAudioRenderer", "Listener " << iListenerID << " new position " );// << *pMotionNew);
pListener->pMotionModel->InputMotionKey( pMotionNew );
}
}
......@@ -887,7 +887,7 @@ CVABATNSoundPath* CVABinauralAirTrafficNoiseAudioRenderer::CreateSoundPath( CVAB
assert( !pSource->bDeleted && !pListener->bDeleted );
VA_VERBOSE( "CVABinauralAirTrafficNoiseAudioRenderer", "Creating sound path from source " << iSourceID << " -> listener " << iListenerID);
VA_VERBOSE( "BinauralAirTrafficNoiseAudioRenderer", "Creating sound path from source " << iSourceID << " -> listener " << iListenerID);
CVABATNSoundPath* pPath = dynamic_cast<CVABATNSoundPath*>( m_pSoundPathPool->RequestObject() );
......@@ -918,7 +918,7 @@ CVABATNSoundPath* CVABinauralAirTrafficNoiseAudioRenderer::CreateSoundPath( CVAB
void CVABinauralAirTrafficNoiseAudioRenderer::DeleteSoundPath( CVABATNSoundPath* pPath )
{
VA_VERBOSE( "CVABinauralAirTrafficNoiseAudioRenderer", "Marking sound path from source " << pPath->pSource->pData->iID << " -> listener " << pPath->pListener->pData->iID << " for deletion");
VA_VERBOSE( "BinauralAirTrafficNoiseAudioRenderer", "Marking sound path from source " << pPath->pSource->pData->iID << " -> listener " << pPath->pListener->pData->iID << " for deletion");
pPath->bDelete = true;
pPath->RemoveReference();
......@@ -927,7 +927,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::DeleteSoundPath( CVABATNSoundPath*
CVABinauralAirTrafficNoiseAudioRenderer::CVABATNListener* CVABinauralAirTrafficNoiseAudioRenderer::CreateListener( int iID, const CVAListenerState* pListenerState )
{
VA_VERBOSE( "CVABinauralAirTrafficNoiseAudioRenderer", "Creating listener with ID " << iID );
VA_VERBOSE( "BinauralAirTrafficNoiseAudioRenderer", "Creating listener with ID " << iID );
CVABATNListener* pListener = dynamic_cast< CVABATNListener* >( m_pListenerPool->RequestObject() );
......@@ -955,7 +955,7 @@ CVABinauralAirTrafficNoiseAudioRenderer::CVABATNListener* CVABinauralAirTrafficN
void CVABinauralAirTrafficNoiseAudioRenderer::DeleteListener( int iListenerID )
{
VA_VERBOSE( "CVABinauralAirTrafficNoiseAudioRenderer", "Marking listener with ID " << iListenerID << " for removal" );
VA_VERBOSE( "BinauralAirTrafficNoiseAudioRenderer", "Marking listener with ID " << iListenerID << " for removal" );
std::map< int, CVABATNListener* >::iterator it = m_mListeners.find( iListenerID );
CVABATNListener* pListener = it->second;
m_mListeners.erase( it );
......@@ -970,7 +970,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::DeleteListener( int iListenerID )
CVABinauralAirTrafficNoiseAudioRenderer::CVABATNSource* CVABinauralAirTrafficNoiseAudioRenderer::CreateSource( int iID, const CVASoundSourceState* pSourceState )
{
VA_VERBOSE( "CVABinauralAirTrafficNoiseAudioRenderer", "Creating source with ID " << iID );
VA_VERBOSE( "BinauralAirTrafficNoiseAudioRenderer", "Creating source with ID " << iID );
CVABATNSource* pSource = dynamic_cast< CVABATNSource* >( m_pSourcePool->RequestObject() );
pSource->pData = m_pCore->GetSceneManager()->GetSoundSourceDesc(iID);
......@@ -991,7 +991,7 @@ CVABinauralAirTrafficNoiseAudioRenderer::CVABATNSource* CVABinauralAirTrafficNoi
void CVABinauralAirTrafficNoiseAudioRenderer::DeleteSource( int iSourceID )
{
VA_VERBOSE( "CVABinauralAirTrafficNoiseAudioRenderer", "Marking source with ID " << iSourceID << " for removal" );
VA_VERBOSE( "BinauralAirTrafficNoiseAudioRenderer", "Marking source with ID " << iSourceID << " for removal" );
std::map< int, CVABATNSource* >::iterator it = m_mSources.find( iSourceID );
CVABATNSource* pSource = it->second;
m_mSources.erase( it );
......@@ -1430,7 +1430,7 @@ void CVABATNSoundPath::UpdateHRIR()
if( iNewFilterLength > oDirSoundPath.pFIRConvolverChL->GetMaxFilterlength() )
{
VA_WARN( "CVABATNSoundPath", "HRIR too long for convolver, cropping. Increase HRIR filter length in BinauralFreefieldAudioRenderer configuration." );
VA_WARN( "BATNSoundPath", "HRIR too long for convolver, cropping. Increase HRIR filter length in BinauralFreefieldAudioRenderer configuration." );
iNewFilterLength = oDirSoundPath.pFIRConvolverChL->GetMaxFilterlength();
}
......@@ -1491,7 +1491,7 @@ void CVABATNSoundPath::UpdateHRIR()
if( iNewFilterLength > oRefSoundPath.pFIRConvolverChL->GetMaxFilterlength() )
{
VA_WARN( "CVABATNSoundPath", "HRIR too long for convolver, cropping. Increase HRIR filter length in BinauralFreefieldAudioRenderer configuration." );
VA_WARN( "BATNSoundPath", "HRIR too long for convolver, cropping. Increase HRIR filter length in BinauralFreefieldAudioRenderer configuration." );
iNewFilterLength = oRefSoundPath.pFIRConvolverChL->GetMaxFilterlength();
}
......
src/Rendering/Binaural/ArtificialReverb/VABinauralArtificialReverb.cpp
View file @ 0a931843
......@@ -269,19 +269,19 @@ void CVABinauralArtificialReverbAudioRenderer::Init( const CVAStruct& oArgs )
if( m_dReverberationTime < g_dMinReverberationTime )
{
VA_WARN( "CVABinauralArtificialReverbAudioRenderer", "Requested reverberation time of " << m_dReverberationTime << " s too small, minimum is " << g_dMinReverberationTime << " s." );
VA_WARN( "BinauralArtificialReverbAudioRenderer", "Requested reverberation time of " << m_dReverberationTime << " s too small, minimum is " << g_dMinReverberationTime << " s." );
m_dReverberationTime = g_dMinReverberationTime;
}
if( m_dRoomSurfaceArea < g_dMinRoomSurfaceArea )
{
VA_WARN( "CVABinauralArtificialReverbAudioRenderer", "Requested room surface of " << m_dRoomSurfaceArea << " m^2 too small, minimum is " << g_dMinRoomSurfaceArea << " m^2." );
VA_WARN( "BinauralArtificialReverbAudioRenderer", "Requested room surface of " << m_dRoomSurfaceArea << " m^2 too small, minimum is " << g_dMinRoomSurfaceArea << " m^2." );
m_dRoomSurfaceArea = g_dMinRoomSurfaceArea;
}
if( m_dRoomVolume < g_dMinRoomVolume )
{
VA_WARN( "CVABinauralArtificialReverbAudioRenderer", "Requested room volume of " << m_dRoomVolume << " m^3 too small, minimum is " << g_dMinRoomVolume << " m^3." );
VA_WARN( "BinauralArtificialReverbAudioRenderer", "Requested room volume of " << m_dRoomVolume << " m^3 too small, minimum is " << g_dMinRoomVolume << " m^3." );
m_dRoomVolume = g_dMinRoomVolume;
}
......@@ -343,18 +343,18 @@ int CVABinauralArtificialReverbAudioRenderer::CallObject( const CVAStruct& oArgs
double dRoomReverberationTime = *pStruct;
if( dRoomReverberationTime < g_dMinReverberationTime )
{
VA_WARN( "CVABinauralArtificialReverbAudioRenderer", "Requested reverberation time of " << m_dReverberationTime << "s too small, minimum is " << g_dMinReverberationTime << "s." );
VA_WARN( "BinauralArtificialReverbAudioRenderer", "Requested reverberation time of " << m_dReverberationTime << "s too small, minimum is " << g_dMinReverberationTime << "s." );
m_dReverberationTime = g_dMinReverberationTime;
}
else
{
m_dReverberationTime = dRoomReverberationTime;
}
VA_INFO( "CVABinauralArtificialReverbAudioRenderer", "Set reverberation time to " << m_dReverberationTime );
VA_INFO( "BinauralArtificialReverbAudioRenderer", "Set reverberation time to " << m_dReverberationTime );
}
if( m_dReverberationTime * GetSampleRate() > m_iMaxReverbFilterLengthSamples )
VA_WARN( "CVABinauralArtificialReverbAudioRenderer",
VA_WARN( "BinauralArtificialReverbAudioRenderer",
"Reverberation time greater than target filter length, reverb will be truncated at "
<< m_iMaxReverbFilterLengthSamples / GetSampleRate() << " seconds"
);
......@@ -374,14 +374,14 @@ int CVABinauralArtificialReverbAudioRenderer::CallObject( const CVAStruct& oArgs
double dRoomVolume = *pStruct;
if( dRoomVolume < g_dMinRoomVolume )
{
VA_WARN( "CVABinauralArtificialReverbAudioRenderer", "Requested room volume of " << dRoomVolume << " m^3 too small, minimum is " << g_dMinRoomVolume << " m^3." );
VA_WARN( "BinauralArtificialReverbAudioRenderer", "Requested room volume of " << dRoomVolume << " m^3 too small, minimum is " << g_dMinRoomVolume << " m^3." );
m_dRoomVolume = g_dMinRoomVolume;
}
else
{
m_dRoomVolume = dRoomVolume;
}
VA_INFO( "CVABinauralArtificialReverbAudioRenderer", "Set room volume to " << m_dRoomVolume << " m^3" );
VA_INFO( "BinauralArtificialReverbAudioRenderer", "Set room volume to " << m_dRoomVolume << " m^3" );
}
m_bForceARUpdateOnce = true;
......@@ -399,14 +399,14 @@ int CVABinauralArtificialReverbAudioRenderer::CallObject( const CVAStruct& oArgs
double dRoomSurfaceArea = *pStruct;
if( dRoomSurfaceArea < g_dMinRoomSurfaceArea )
{
VA_WARN( "CVABinauralArtificialReverbAudioRenderer", "Requested room surface area of " << dRoomSurfaceArea << " m^2 too small, setting to minimum of " << g_dMinRoomSurfaceArea << " m^2." );
VA_WARN( "BinauralArtificialReverbAudioRenderer", "Requested room surface area of " << dRoomSurfaceArea << " m^2 too small, setting to minimum of " << g_dMinRoomSurfaceArea << " m^2." );
m_dRoomVolume = g_dMinRoomVolume;
}
else
{
m_dRoomSurfaceArea = dRoomSurfaceArea;
}
VA_INFO( "CVABinauralArtificialReverbAudioRenderer", "Set room surface area to " << m_dRoomSurfaceArea << " m^2" );
VA_INFO( "BinauralArtificialReverbAudioRenderer", "Set room surface area to " << m_dRoomSurfaceArea << " m^2" );
}
......@@ -431,7 +431,7 @@ int CVABinauralArtificialReverbAudioRenderer::CallObject( const CVAStruct& oArgs
{
ITA_EXCEPT1( INVALID_PARAMETER, "Sound power correction must be positive" )
}
VA_INFO( "CVABinauralArtificialReverbAudioRenderer", "Set sound power correction to " << m_dSoundPowerCorrectionFactor );
VA_INFO( "BinauralArtificialReverbAudioRenderer", "Set sound power correction to " << m_dSoundPowerCorrectionFactor );
}
m_bForceARUpdateOnce = true;
......@@ -868,7 +868,7 @@ void CVABinauralArtificialReverbAudioRenderer::UpdateTrajectories()
if( pMotionNew && ( pMotionNew != pMotionCur ) )
{
VA_TRACE( "CVABinauralArtificialReverbAudioRenderer", "Source " << iSourceID << " new motion state" );
VA_TRACE( "BinauralArtificialReverbAudioRenderer", "Source " << iSourceID << " new motion state" );
pSource->pMotionModel->InputMotionKey( pMotionNew );
}
......@@ -889,7 +889,7 @@ void CVABinauralArtificialReverbAudioRenderer::UpdateTrajectories()
if( pMotionNew && ( pMotionNew != pMotionCur ) )
{
VA_TRACE( "CVABinauralAudioRenderer", "Listener " << iListenerID << " new position " );
VA_TRACE( "BinauralAudioRenderer", "Listener " << iListenerID << " new position " );
pListener->pMotionModel->InputMotionKey( pMotionNew );
}
......@@ -935,7 +935,7 @@ CBARPath* CVABinauralArtificialReverbAudioRenderer::CreateArtificialReverbPath(
assert( !pSource->bDeleted && !pListener->bDeleted );
VA_VERBOSE( "CVABinauralArtificialReverbAudioRenderer", "Creating AR path from source " << iSourceID << " -> listener " << iListenerID );
VA_VERBOSE( "BinauralArtificialReverbAudioRenderer", "Creating AR path from source " << iSourceID << " -> listener " << iListenerID );
CBARPath* pPath = dynamic_cast< CBARPath* >( m_pARPathPool->RequestObject() );
......@@ -953,7 +953,7 @@ CBARPath* CVABinauralArtificialReverbAudioRenderer::CreateArtificialReverbPath(
void CVABinauralArtificialReverbAudioRenderer::DeleteArtificialReverbPath( CBARPath* pPath )
{
VA_VERBOSE( "CVABinauralArtificialReverbAudioRenderer", "Marking AR path from source " << pPath->pSource->pData->iID << " -> listener " << pPath->pListener->pData->iID << " for deletion" );
VA_VERBOSE( "BinauralArtificialReverbAudioRenderer", "Marking AR path from source " << pPath->pSource->pData->iID << " -> listener " << pPath->pListener->pData->iID << " for deletion" );
// Zur Lschung markieren
pPath->bMarkedForDeletion = true;
......@@ -965,7 +965,7 @@ void CVABinauralArtificialReverbAudioRenderer::DeleteArtificialReverbPath( CBARP
CVABinauralArtificialReverbAudioRenderer::Listener* CVABinauralArtificialReverbAudioRenderer::CreateListener( int iID )
{
VA_VERBOSE( "CVABinauralAudioRenderer", "Creating listener with ID " << iID );
VA_VERBOSE( "BinauralAudioRenderer", "Creating listener with ID " << iID );
Listener* pListener = dynamic_cast< Listener* >( m_pListenerPool->RequestObject() ); // Reference = 1
......@@ -997,7 +997,7 @@ CVABinauralArtificialReverbAudioRenderer::Listener* CVABinauralArtificialReverbA
void CVABinauralArtificialReverbAudioRenderer::DeleteListener( int iListenerID )
{
VA_VERBOSE( "CVABinauralAudioRenderer", "Marking listener with ID " << iListenerID << " for removal" );
VA_VERBOSE( "BinauralAudioRenderer", "Marking listener with ID " << iListenerID << " for removal" );
std::map< int, Listener* >::iterator it = m_mListener.find( iListenerID );
Listener* pListener = it->second;
m_mListener.erase( it );
......@@ -1017,7 +1017,7 @@ void CVABinauralArtificialReverbAudioRenderer::DeleteListener( int iListenerID )
CVABinauralArtificialReverbAudioRenderer::Source* CVABinauralArtificialReverbAudioRenderer::CreateSource( int iID )
{
VA_VERBOSE( "CVABinauralArtificialReverbAudioRenderer", "Creating source with ID " << iID );
VA_VERBOSE( "BinauralArtificialReverbAudioRenderer", "Creating source with ID " << iID );
Source* pSource = dynamic_cast< Source* >( m_pSourcePool->RequestObject() );
......@@ -1036,7 +1036,7 @@ CVABinauralArtificialReverbAudioRenderer::Source* CVABinauralArtificialReverbAud
void CVABinauralArtificialReverbAudioRenderer::DeleteSource( int iSourceID )
{
VA_VERBOSE( "CVABinauralAudioRenderer", "Marking source with ID " << iSourceID << " for removal" );
VA_VERBOSE( "BinauralAudioRenderer", "Marking source with ID " << iSourceID << " for removal" );
std::map< int, Source* >::iterator it = m_mSources.find( iSourceID );
Source* pSource = it->second;
m_mSources.erase( it );
......@@ -1210,7 +1210,7 @@ void CVABinauralArtificialReverbAudioRenderer::UpdateArtificialReverbFilter( Lis
if( ( pListener->pCurHRIR == nullptr ) && ( pListener->pNewHRIR == nullptr ) )
return;
VA_INFO( "CVABinauralArtificialReverbAudioRenderer", "Calculating artificial reverberation filter for listener '" << pListener->pData->sName << "'" );
VA_INFO( "BinauralArtificialReverbAudioRenderer", "Calculating artificial reverberation filter for listener '" << pListener->pData->sName << "'" );
// local copies
const double dRoomSurfaceArea = m_dRoomSurfaceArea;
......@@ -1220,7 +1220,7 @@ void CVABinauralArtificialReverbAudioRenderer::UpdateArtificialReverbFilter( Lis
const double dSoundPowerCorrectionFactor = m_dSoundPowerCorrectionFactor;
if( ceil( dReverberationTime * GetSampleRate() ) > m_iMaxReverbFilterLengthSamples )
VA_WARN( "CVABinauralArtificialReverbAudioRenderer", "Target filter length smaller than requested reverberation time, truncating." )
VA_WARN( "BinauralArtificialReverbAudioRenderer", "Target filter length smaller than requested reverberation time, truncating." )
ITASampleFrame sfBRIR( 2, m_iMaxReverbFilterLengthSamples, true ); // 0=L, 1=R, TODO member var?
......@@ -1410,12 +1410,12 @@ void CVABinauralArtificialReverbAudioRenderer::UpdateArtificialReverbFilter( Lis
}
if( fMaxAbs > 1.0f )
{
VA_WARN( "CVABinauralArtificialReverbAudioRenderer", "Reverberation filter clipping detected, normalizing." );
VA_WARN( "BinauralArtificialReverbAudioRenderer", "Reverberation filter clipping detected, normalizing." );
writeAudiofile( "ArtificialReverb_clipping.wav", &sfBRIR, GetSampleRate() );
sfBRIR.mul_scalar( 1.0f / fMaxAbs );
}
VA_INFO( "CVABinauralArtificialReverbAudioRenderer", "Updating new artificial reverberation filter for listener '" << pListener->pData->sName << "'" );
VA_INFO( "BinauralArtificialReverbAudioRenderer", "Updating new artificial reverberation filter for listener '" << pListener->pData->sName << "'" );
ITAUPFilter* pBRIR_L = pListener->pConvolverL->RequestFilter();
ITAUPFilter* pBRIR_R = pListener->pConvolverR->RequestFilter();
......
src/Rendering/Binaural/FreeField/VABinauralFreeFieldAudioRenderer.cpp
View file @ 0a931843
......@@ -1277,7 +1277,7 @@ void CVABFFSoundPath::UpdateHRIR( const CVAListenerState::CVAAnthropometricParam
if( iNewFilterLength > pFIRConvolverChL->GetMaxFilterlength() )
{
VA_WARN( "CVABFFSoundPath", "HRIR too long for convolver, cropping. Increase HRIR filter length in BinauralFreefieldAudioRenderer configuration." );
VA_WARN( "BFFSoundPath", "HRIR too long for convolver, cropping. Increase HRIR filter length in BinauralFreefieldAudioRenderer configuration." );
iNewFilterLength = pFIRConvolverChL->GetMaxFilterlength();
}
......
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsAudioRenderer.cpp
View file @ 0a931843
......@@ -1170,7 +1170,7 @@ CVARoomAcousticsAudioRenderer::CVARoomAcousticsAudioRenderer( const CVAAudioRend
conf.OptString( "RavenDataBasePath", sRavenDataBasePath, "$(RavenDataBasePath)" );
sRavenDataBasePath = m_pCore->GetCoreConfig()->mMacros.SubstituteMacros( sRavenDataBasePath );
VA_INFO( "CVARoomAcousticsAudioRenderer", "RAVEN data base path is set to '" << sRavenDataBasePath << "'" );
VA_INFO( "RoomAcousticsAudioRenderer", "RAVEN data base path is set to '" << sRavenDataBasePath << "'" );
if( m_iSetup == SETUP_LOCAL )
{
......@@ -1264,11 +1264,11 @@ CVARoomAcousticsAudioRenderer::CVARoomAcousticsAudioRenderer( const CVAAudioRend
}
else
{
VA_ERROR( "CVARoomAcousticsAudioRenderer", "Setup with id " << m_iSetup << " is unrecognized" );
VA_ERROR( "RoomAcousticsAudioRenderer", "Setup with id " << m_iSetup << " is unrecognized" );
}
if( !m_pVARaven->AttachSimulationResultHandler( this ) )
VA_WARN( "CVARoomAcousticsAudioRenderer", "Could not attach audio renderer as simulation result handler" );
VA_WARN( "RoomAcousticsAudioRenderer", "Could not attach audio renderer as simulation result handler" );
/*