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
...@@ -94,10 +94,10 @@ void CVAAudiofileSignalSource::SetPlaybackAction( int iPlayStateAction ) ...@@ -94,10 +94,10 @@ void CVAAudiofileSignalSource::SetPlaybackAction( int iPlayStateAction )
m_iRequestedPlaybackAction = iPlayStateAction; m_iRequestedPlaybackAction = iPlayStateAction;
break; break;
case IVACore::VA_PLAYBACK_ACTION_NONE: case IVACore::VA_PLAYBACK_ACTION_NONE:
VA_WARN( "CVAAudiofileSignalSource", "Ignoring playback action '" << iPlayStateAction << "' (NONE)" ); VA_WARN( "AudiofileSignalSource", "Ignoring playback action '" << iPlayStateAction << "' (NONE)" );
break; break;
default: default:
VA_ERROR( "CVAAudiofileSignalSource", "Could not apply unkown playback action '" << iPlayStateAction << "'" ); VA_ERROR( "AudiofileSignalSource", "Could not apply unkown playback action '" << iPlayStateAction << "'" );
break; break;
} }
...@@ -248,7 +248,7 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState ...@@ -248,7 +248,7 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
if( m_pBufferDataSource->GetLoopMode() == false ) if( m_pBufferDataSource->GetLoopMode() == false )
{ {
m_iCurrentPlayState = IVACore::VA_PLAYBACK_STATE_STOPPED; // Attention, directly modifying member, only OK here. 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; break;
...@@ -313,7 +313,7 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState ...@@ -313,7 +313,7 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
if( m_iCurrentPlayState != iNewPlaybackState && !bSyncMod ) 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 ) << "'" ); " to '" << GetStateString( iNewPlaybackState ) << "'" );
assert( iNewPlaybackState != IVACore::VA_PLAYBACK_STATE_INVALID ); assert( iNewPlaybackState != IVACore::VA_PLAYBACK_STATE_INVALID );
......
...@@ -216,7 +216,7 @@ const float* CVAMachineSignalSource::GetStreamBlock( const CVAAudiostreamState* ...@@ -216,7 +216,7 @@ const float* CVAMachineSignalSource::GetStreamBlock( const CVAAudiostreamState*
for( int i=0; i<m_sbOut.length(); i++ ) for( int i=0; i<m_sbOut.length(); i++ )
{ {
if( m_sbOut[i] > 1.0f || m_sbOut[i] < -1.0f ) 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(); return m_sbOut.data();
......
...@@ -83,7 +83,7 @@ const float* CVATextToSpeechSignalSource::GetStreamBlock( const CVAAudiostreamSt ...@@ -83,7 +83,7 @@ const float* CVATextToSpeechSignalSource::GetStreamBlock( const CVAAudiostreamSt
delete m_pFrameToDelete; delete m_pFrameToDelete;
m_pFrameToDelete = NULL; 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 ...@@ -124,7 +124,7 @@ std::string CVATextToSpeechSignalSource::GetStateString() const
void CVATextToSpeechSignalSource::Reset() 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 CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) const
...@@ -134,7 +134,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c ...@@ -134,7 +134,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c
#ifndef VACORE_WITH_TTS_SIGNAL_SOURCE #ifndef VACORE_WITH_TTS_SIGNAL_SOURCE
oRet[ "error" ] = "TTS signal sources not activated in your VACore"; 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 #else
/* /*
...@@ -146,7 +146,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c ...@@ -146,7 +146,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c
auto it = m_Visemes.find(id); auto it = m_Visemes.find(id);
if (it == m_Visemes.end()){ 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"] = ""; oRet["visemes"] = "";
return oRet; return oRet;
} }
...@@ -187,12 +187,12 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c ...@@ -187,12 +187,12 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c
if (oArgs.IsEmpty()) if (oArgs.IsEmpty())
{ {
oRet["info"] = "see VATextToSpeechSignalSource.h documentation for SetParameters() for usage information"; 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; return oRet;
} }
oRet["info"] = "Unknown parameters! see VATextToSpeechSignalSource.h documentation for SetParameters() for usage information"; 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 #endif
return oRet; return oRet;
...@@ -201,7 +201,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c ...@@ -201,7 +201,7 @@ CVAStruct CVATextToSpeechSignalSource::GetParameters( const CVAStruct& oArgs ) c
void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams ) void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
{ {
#ifndef VACORE_WITH_TTS_SIGNAL_SOURCE #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 #else
/* /*
...@@ -210,7 +210,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams ) ...@@ -210,7 +210,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
if (oParams.HasKey("prepare_text")){ if (oParams.HasKey("prepare_text")){
if (!oParams["prepare_text"].IsString()){ if (!oParams["prepare_text"].IsString()){
VA_WARN("CVATextToSpeechSignalSource", "No Text given!"); VA_WARN("TextToSpeechSignalSource", "No Text given!");
return; return;
} }
std::string sText = oParams["prepare_text"]; std::string sText = oParams["prepare_text"];
...@@ -227,7 +227,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams ) ...@@ -227,7 +227,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
std::string id = "tmp"; std::string id = "tmp";
if (!oParams.HasKey("id") || !oParams["id"].IsString()){ if (!oParams.HasKey("id") || !oParams["id"].IsString()){
if (!direct_playback){ 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; return;
} }
} }
...@@ -235,7 +235,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams ) ...@@ -235,7 +235,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
id = oParams["id"]; id = oParams["id"];
if (m_Visemes.find(id) != m_Visemes.end() && id.compare("tmp")!=0){ 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 ) ...@@ -257,7 +257,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
#endif #endif
CPRC_abuf* buf = CPRCEN_engine_channel_speak(TTSEngine::getInstance().getEngine(), chan, sText.c_str(), sText.length(), true); CPRC_abuf* buf = CPRCEN_engine_channel_speak(TTSEngine::getInstance().getEngine(), chan, sText.c_str(), sText.length(), true);
if (buf == NULL){ 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; return;
} }
...@@ -292,7 +292,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams ) ...@@ -292,7 +292,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
SetParameters(oParams_play); 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; return;
} }
...@@ -309,7 +309,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams ) ...@@ -309,7 +309,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
if (oParams["play_speech"].IsString()) if (oParams["play_speech"].IsString())
id = oParams["play_speech"]; id = oParams["play_speech"];
else 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 = new CVAAudiofileSignalSource("D:/work/tts.wav", GetSampleRate(), GetBlocklength());
//pAudioFile->SetIsLooping(true); //pAudioFile->SetIsLooping(true);
...@@ -326,7 +326,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams ) ...@@ -326,7 +326,7 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
auto it = m_AudioSampleFrames.find(id); auto it = m_AudioSampleFrames.find(id);
if (it == m_AudioSampleFrames.end() || it->second==NULL){ 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; return;
} }
...@@ -349,12 +349,12 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams ) ...@@ -349,12 +349,12 @@ void CVATextToSpeechSignalSource::SetParameters( const CVAStruct& oParams )
m_Visemes[id] = ""; m_Visemes[id] = "";
} }
VA_INFO("CVATextToSpeechSignalSource", "Play TTS for id: \"" + id + "\""); VA_INFO("TextToSpeechSignalSource", "Play TTS for id: \"" + id + "\"");
return; 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 #endif
} }
...@@ -376,12 +376,12 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user ...@@ -376,12 +376,12 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user
float endTime = 0.0f; float endTime = 0.0f;
if (abuf == NULL){ if (abuf == NULL){
VA_WARN("CVATextToSpeechSignalSource", "The buffer is NULL, cannot extract visemes!"); VA_WARN("TextToSpeechSignalSource", "The buffer is NULL, cannot extract visemes!");
return; return;
} }
if (userdata == NULL){ 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; return;
} }
...@@ -397,7 +397,7 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user ...@@ -397,7 +397,7 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user
end = CPRC_abuf_trans_end(trans); /* End time in seconds */ end = CPRC_abuf_trans_end(trans); /* End time in seconds */
label = CPRC_abuf_trans_name(trans); /* Label, type dependent */ label = CPRC_abuf_trans_name(trans); /* Label, type dependent */
if (CPRC_abuf_trans_type(trans) == CPRC_ABUF_TRANS_PHONE) { 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"); //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 ") std::string viseme = std::string("\t<lips ")
+ "viseme=\"" + TTSEngine::getInstance().PhonemeToViseme(label) + "\" " + "viseme=\"" + TTSEngine::getInstance().PhonemeToViseme(label) + "\" "
...@@ -411,13 +411,13 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user ...@@ -411,13 +411,13 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user
endTime = end; endTime = end;
} }
/*else if (CPRC_abuf_trans_type(trans) == CPRC_ABUF_TRANS_WORD) { /*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) { 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) { 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; data->lastEnd = endTime;
...@@ -444,11 +444,11 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){ ...@@ -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 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){ 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); VistaFileSystemDirectory voicesDir(voices_path);
if (!voicesDir.Exists()){ if (!voicesDir.Exists()){
VA_WARN("CVATextToSpeechSignalSource", "The voices directory does not exist!"); VA_WARN("TextToSpeechSignalSource", "The voices directory does not exist!");
continue; continue;
} }
...@@ -460,11 +460,11 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){ ...@@ -460,11 +460,11 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){
std::string licence_file = name.substr(0, suffix_pos) + ".lic"; std::string licence_file = name.substr(0, suffix_pos) + ".lic";
VistaFileSystemFile licenseFile(licence_file); VistaFileSystemFile licenseFile(licence_file);
if (!licenseFile.Exists()){ 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; continue;
} }
CPRCEN_engine_load_voice(m_pTTSEngine, licence_file.c_str(), NULL, name.c_str(), CPRC_VOICE_LOAD); 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(){ ...@@ -472,7 +472,7 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){
m_sampleRate = -1.0; m_sampleRate = -1.0;
int num_voices = CPRCEN_engine_get_voice_count(getEngine()); int num_voices = CPRCEN_engine_get_voice_count(getEngine());
if (num_voices == 0){ 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++) { for (int i = 0; i < num_voices; i++) {
std::string strSamplerate = CPRCEN_engine_get_voice_info(getEngine(), i, "SAMPLE_RATE"); std::string strSamplerate = CPRCEN_engine_get_voice_info(getEngine(), i, "SAMPLE_RATE");
...@@ -480,7 +480,7 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){ ...@@ -480,7 +480,7 @@ void CVATextToSpeechSignalSource::TTSEngine::Init(){
if (m_sampleRate < 0.0) if (m_sampleRate < 0.0)
m_sampleRate = rate; m_sampleRate = rate;
if (rate != m_sampleRate) 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(); SetupPhonemeMapping();
...@@ -512,13 +512,13 @@ std::string CVATextToSpeechSignalSource::TTSEngine::PhonemeToViseme(std::string ...@@ -512,13 +512,13 @@ std::string CVATextToSpeechSignalSource::TTSEngine::PhonemeToViseme(std::string
auto it = m_phonemeToId.find(phoneme); auto it = m_phonemeToId.find(phoneme);
if (it == m_phonemeToId.end()){ 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; return phoneme;
} }
auto it2 = m_idToViseme.find(it->second); auto it2 = m_idToViseme.find(it->second);
if (it2 == m_idToViseme.end()){ 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 phoneme;
} }
return it2->second; return it2->second;
......
...@@ -192,7 +192,7 @@ void CVAHRIRDatasetDAFF2D::GetHRIRByIndex(ITASampleFrame* psfDest, ...@@ -192,7 +192,7 @@ void CVAHRIRDatasetDAFF2D::GetHRIRByIndex(ITASampleFrame* psfDest,
assert( m_pContent ); assert( m_pContent );
if (psfDest->channels() > m_pReader->getProperties()->getNumberOfChannels()) 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; int iResult;
for (int iChan=0;iChan<psfDest->channels();iChan++) for (int iChan=0;iChan<psfDest->channels();iChan++)
......
...@@ -830,7 +830,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::UpdateTrajectories() ...@@ -830,7 +830,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::UpdateTrajectories()
if( pMotionNew && ( pMotionNew != pMotionCur ) ) if( pMotionNew && ( pMotionNew != pMotionCur ) )
{ {
VA_TRACE( "CVABinauralAirTrafficNoiseAudioRenderer", "Source " << iSourceID << " new motion state" ); VA_TRACE( "BinauralAirTrafficNoiseAudioRenderer", "Source " << iSourceID << " new motion state" );
pSource->pMotionModel->InputMotionKey( pMotionNew ); pSource->pMotionModel->InputMotionKey( pMotionNew );
} }
} }
...@@ -849,7 +849,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::UpdateTrajectories() ...@@ -849,7 +849,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::UpdateTrajectories()
if( pMotionNew && ( pMotionNew != pMotionCur ) ) if( pMotionNew && ( pMotionNew != pMotionCur ) )
{ {
VA_TRACE( "CVABinauralAirTrafficNoiseAudioRenderer", "Listener " << iListenerID << " new position " );// << *pMotionNew); VA_TRACE( "BinauralAirTrafficNoiseAudioRenderer", "Listener " << iListenerID << " new position " );// << *pMotionNew);
pListener->pMotionModel->InputMotionKey( pMotionNew ); pListener->pMotionModel->InputMotionKey( pMotionNew );
} }
} }
...@@ -887,7 +887,7 @@ CVABATNSoundPath* CVABinauralAirTrafficNoiseAudioRenderer::CreateSoundPath( CVAB ...@@ -887,7 +887,7 @@ CVABATNSoundPath* CVABinauralAirTrafficNoiseAudioRenderer::CreateSoundPath( CVAB
assert( !pSource->bDeleted && !pListener->bDeleted ); 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() ); CVABATNSoundPath* pPath = dynamic_cast<CVABATNSoundPath*>( m_pSoundPathPool->RequestObject() );
...@@ -918,7 +918,7 @@ CVABATNSoundPath* CVABinauralAirTrafficNoiseAudioRenderer::CreateSoundPath( CVAB ...@@ -918,7 +918,7 @@ CVABATNSoundPath* CVABinauralAirTrafficNoiseAudioRenderer::CreateSoundPath( CVAB
void CVABinauralAirTrafficNoiseAudioRenderer::DeleteSoundPath( CVABATNSoundPath* pPath ) 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->bDelete = true;
pPath->RemoveReference(); pPath->RemoveReference();
...@@ -927,7 +927,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::DeleteSoundPath( CVABATNSoundPath* ...@@ -927,7 +927,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::DeleteSoundPath( CVABATNSoundPath*
CVABinauralAirTrafficNoiseAudioRenderer::CVABATNListener* CVABinauralAirTrafficNoiseAudioRenderer::CreateListener( int iID, const CVAListenerState* pListenerState ) 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() ); CVABATNListener* pListener = dynamic_cast< CVABATNListener* >( m_pListenerPool->RequestObject() );
...@@ -955,7 +955,7 @@ CVABinauralAirTrafficNoiseAudioRenderer::CVABATNListener* CVABinauralAirTrafficN ...@@ -955,7 +955,7 @@ CVABinauralAirTrafficNoiseAudioRenderer::CVABATNListener* CVABinauralAirTrafficN
void CVABinauralAirTrafficNoiseAudioRenderer::DeleteListener( int iListenerID ) 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 ); std::map< int, CVABATNListener* >::iterator it = m_mListeners.find( iListenerID );
CVABATNListener* pListener = it->second; CVABATNListener* pListener = it->second;
m_mListeners.erase( it ); m_mListeners.erase( it );
...@@ -970,7 +970,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::DeleteListener( int iListenerID ) ...@@ -970,7 +970,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::DeleteListener( int iListenerID )
CVABinauralAirTrafficNoiseAudioRenderer::CVABATNSource* CVABinauralAirTrafficNoiseAudioRenderer::CreateSource( int iID, const CVASoundSourceState* pSourceState ) 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() ); CVABATNSource* pSource = dynamic_cast< CVABATNSource* >( m_pSourcePool->RequestObject() );
pSource->pData = m_pCore->GetSceneManager()->GetSoundSourceDesc(iID); pSource->pData = m_pCore->GetSceneManager()->GetSoundSourceDesc(iID);
...@@ -991,7 +991,7 @@ CVABinauralAirTrafficNoiseAudioRenderer::CVABATNSource* CVABinauralAirTrafficNoi ...@@ -991,7 +991,7 @@ CVABinauralAirTrafficNoiseAudioRenderer::CVABATNSource* CVABinauralAirTrafficNoi
void CVABinauralAirTrafficNoiseAudioRenderer::DeleteSource( int iSourceID ) 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 ); std::map< int, CVABATNSource* >::iterator it = m_mSources.find( iSourceID );
CVABATNSource* pSource = it->second; CVABATNSource* pSource = it->second;
m_mSources.erase( it ); m_mSources.erase( it );
...@@ -1430,7 +1430,7 @@ void CVABATNSoundPath::UpdateHRIR() ...@@ -1430,7 +1430,7 @@ void CVABATNSoundPath::UpdateHRIR()
if( iNewFilterLength > oDirSoundPath.pFIRConvolverChL->GetMaxFilterlength() ) 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(); iNewFilterLength = oDirSoundPath.pFIRConvolverChL->GetMaxFilterlength();
} }
...@@ -1491,7 +1491,7 @@ void CVABATNSoundPath::UpdateHRIR() ...@@ -1491,7 +1491,7 @@ void CVABATNSoundPath::UpdateHRIR()
if( iNewFilterLength > oRefSoundPath.pFIRConvolverChL->GetMaxFilterlength() ) 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(); iNewFilterLength = oRefSoundPath.pFIRConvolverChL->GetMaxFilterlength();
} }
......
...@@ -269,19 +269,19 @@ void CVABinauralArtificialReverbAudioRenderer::Init( const CVAStruct& oArgs ) ...@@ -269,19 +269,19 @@ void CVABinauralArtificialReverbAudioRenderer::Init( const CVAStruct& oArgs )
if( m_dReverberationTime < g_dMinReverberationTime ) 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; m_dReverberationTime = g_dMinReverberationTime;
} }
if( m_dRoomSurfaceArea < g_dMinRoomSurfaceArea ) 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;</