Commit f0cdeb72 authored by lmoesch's avatar lmoesch

Merged into lates develop.

parents b9c8a01c f1f254e7
......@@ -39,7 +39,7 @@ int main( int, char** )
oConfig[ "Reproduction:MyTalkthroughHeadphones" ] = oReproduction;
CVAStruct oRenderer;
oRenderer[ "class" ] = "PrototypeDummy";
oRenderer[ "class" ] = "BinauralRealTime";
oRenderer[ "outputs" ] = "MyTalkthroughHeadphones";
oRenderer[ "outputgroup" ] = "MyDesktopHP";
oConfig[ "Renderer:BenchmarkDummyRenderer" ] = oRenderer;
......@@ -58,6 +58,7 @@ int main( int, char** )
std::vector< int > viSourceIDs( i );
for( int k = 0; k < i; k++ )
viSourceIDs[ k ] = pCore->CreateSoundSource( "BenchmarkSoundSource" );
//pCore->SetSoundSourcePosition(k, )
for( int k = 0; k < i; k++ )
pCore->DeleteSoundSource( viSourceIDs[ k ] );
swIterations.stop();
......
......@@ -66,14 +66,6 @@ ProjectName = MyVirtualAcousticsProject
[Debug]
# Record device input and store to hard drive (will record every input channel)
InputRecordEnabled = false
InputRecordFilePath = $(ProjectName)_in.wav
# Record device output and store to hard drive (will record every output channel)
OutputRecordEnabled = false
OutputRecordFilePath = $(ProjectName)_out.wav
# Set log level: 0 = quiet; 1 = errors; 2 = warnings (default); 3 = info; 4 = verbose; 5 = trace;
LogLevel = @ITA_VACORE_DEFAULT_DEBUG_LEVEL@
......@@ -109,6 +101,16 @@ BufferSize = AUTO
# Define number of output channels manually (e.g. for virtual device)
OutputChannels = AUTO
# Record device input and store to hard drive (will record every input channel)
RecordInputEnabled = false
RecordInputFileName = device_in.wav
RecordInputBaseFolder = recordings/$(ProjectName)/device
# Record device output and store to hard drive (will record every output channel)
RecordOutputEnabled = false
RecordOutputFileName = device_out.wav
RecordOutputBaseFolder = recordings/$(ProjectName)/device
[Calibration]
......@@ -144,7 +146,8 @@ Class = BinauralFreeField
Reproductions = MyTalkthroughHeadphones
OutputDetectorEnabled = false
RecordOutputEnabled = false
RecordOutputFilePath = $(ProjectName)_Renderer_MyBinauralFreeField_Output.wav
RecordOutputFileName = renderer_out.wav
RecordOutputBaseFolder = recordings/$(ProjectName)/renderer/MyBinauralFreeField
HRIRFilterLength = 256
MotionModelNumHistoryKeys = 10000
MotionModelWindowSize = 0.1
......@@ -232,7 +235,8 @@ NumChannels = 2
IRFilterLengthSamples = 88200
OutputMonitoring = true
RecordOutputEnabled = false
RecordOutputFilePath = $(ProjectName)_Renderer_MyGenericRenderer_Output.wav
RecordOutputFileName = renderer_out.wav
RecordOutputBaseFolder = recordings/$(ProjectName)/renderer/MyGenericRenderer
[Renderer:MyAirTrafficNoiseRenderer]
Class = BinauralAirTrafficNoise
......@@ -277,9 +281,11 @@ Outputs = MyDesktopHP
InputDetectorEnabled = false
OutputDetectorEnabled = false
RecordInputEnabled = false
RecordInputFilePath = $(ProjectName)_Reproduction_MyTalkthroughHeadphones_Input.wav
RecordInputFileName = reproduction_in.wav
RecordInputBaseFolder = recordings/$(ProjectName)/reproduction/MyTalkthroughHeadphones
RecordOutputEnabled = false
RecordOutputFilePath = $(ProjectName)_Reproduction_MyTalkthroughHeadphones_Output.wav
RecordOutputFileName = reproduction_out.wav
RecordOutputBaseFolder = recordings/$(ProjectName)/reproduction/MyTalkthroughHeadphones
[Reproduction:MySubwooferMixer]
Class = LowFrequencyMixer
......
......@@ -46,19 +46,20 @@ Class = BinauralFreeField
Enabled = true
Reproductions = MyTalkthroughHeadphones
RecordOutputEnabled = true
RecordOutputFilePath = BinauralFreeField_rendering.wav
RecordOutputFileName = renderer_out.wav
RecordOutputBaseFolder = recordings/$(ProjectName)/renderer/MyBinauralFreeField
[Reproduction:MyTalkthroughHeadphones]
Class = Talkthrough
Enabled = true
Name = Generic talkthrough to output group
Outputs = MyDesktopHP
InputDetectorEnabled = false
OutputDetectorEnabled = false
RecordInputEnabled = false
RecordInputFilePath = $(ProjectName)_Reproduction_MyTalkthroughHeadphones_Input.wav
RecordOutputEnabled = false
RecordOutputFilePath = $(ProjectName)_Reproduction_MyTalkthroughHeadphones_Output.wav
RecordInputFileName = reproduction_in.wav
RecordInputBaseFolder = recordings/$(ProjectName)/reproduction/MyHeadphones
RecordOutputEnabled = true
RecordOutputFileName = reproduction_out.wav
RecordOutputBaseFolder = recordings/$(ProjectName)/reproduction/MyHeadphones
[Setup]
[Output:MyDesktopHP]
......
......@@ -15,7 +15,7 @@
#include <VAAudioSignalSource.h>
#include "../VAAudiostreamTracker.h"
#include "../VACoreImpl.h"
#include "../core/core.h"
#include <VAException.h>
#include "../VALog.h"
#include "VAAudiofileSignalSource.h"
......
......@@ -13,7 +13,7 @@
#include "VAEngineSignalSource.h"
#include "../VACoreImpl.h"
#include "../core/core.h"
#include "../VAAudiostreamTracker.h"
#include "../VALog.h"
......
......@@ -14,7 +14,7 @@
#include "VAMachineSignalSource.h"
#include "../VAAudiostreamTracker.h"
#include "../VACoreImpl.h"
#include "../core/core.h"
#include "../VALog.h"
#include <ITAAudiofileReader.h>
......
......@@ -13,7 +13,7 @@
#include "VATextToSpeechSignalSource.h"
#include "../VAAudiostreamTracker.h"
#include "../VACoreImpl.h"
#include "../core/core.h"
#include "../VALog.h"
#include <ITAAudiofileReader.h>
......
# $Id:$
set( RelativeDir "src/Audiosignals" )
set( RelativeSourceGroup "Source Files\\Audiosignals" )
set( RelativeSourceGroup "src\\Audiosignals" )
set( DirFiles
VAAudioSignalSourceManager.cpp
......
# $Id:$
set( RelativeDir "src/Drivers/Audio" )
set( RelativeSourceGroup "Source Files\\Drivers\\Audio" )
set( RelativeSourceGroup "src\\Drivers\\Audio" )
set( DirFiles
VAAudioDriverBackend.cpp
......
# $Id:$
set( RelativeDir "src/Drivers" )
set( RelativeSourceGroup "Source Files\\Drivers" )
set( RelativeSourceGroup "src\\drivers" )
set( SubDirs Audio )
set( DirFiles
......
# $Id:$
set( RelativeDir "src/Filtering" )
set( RelativeSourceGroup "Source Files\\Filtering" )
set( RelativeSourceGroup "src\\Filtering" )
set( DirFiles
VAAtmosphere.cpp
......
set( RelativeDir "src/Medium" )
set( RelativeSourceGroup "Source Files\\Medium" )
set( RelativeSourceGroup "src\\Medium" )
set( DirFiles
VAHomogeneousMedium.h
......
set( RelativeDir "src/Motion" )
set( RelativeSourceGroup "Source Files\\Motion" )
set( RelativeSourceGroup "src\\Motion" )
set( DirFiles
VAMotionModel.h
......
......@@ -18,7 +18,7 @@
#include "../../../Scene/VASoundSourceDesc.h"
#include "../../../Scene/VASoundSourceState.h"
#include "../../../Utils/VAUtils.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VAHardwareSetup.h"
// ITA includes
......
# $Id:$
set( RelativeDir "src/Rendering/Ambient/Mixer" )
set( RelativeSourceGroup "Source Files\\Rendering\\Ambient\\Mixer" )
set( RelativeSourceGroup "src\\Rendering\\Ambient\\Mixer" )
set( DirFiles
VAAmbientMixerAudioRenderer.cpp
......
# $Id:$
set( RelativeDir "src/Rendering/Ambient" )
set( RelativeSourceGroup "Source Files\\Rendering\\Ambient" )
set( RelativeSourceGroup "src\\Rendering\\Ambient" )
set( SubDirs Mixer )
set( DirFiles
......
......@@ -25,7 +25,7 @@
#include "../../../Utils/VAUtils.h"
#include "../../../VAAudiostreamTracker.h"
#include <VA.h>
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VACoreConfig.h"
#include "../../../VALog.h"
#include <VAObjectPool.h>
......
......@@ -26,7 +26,7 @@
#include <VA.h>
#include <VAObjectPool.h>
#include "../../../VASourceListenerMetrics.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
// ITA includes
#include <ITABufferedAudioFileWriter.h>
......@@ -221,7 +221,7 @@ protected:
bool bValidTrajectoryPresent; //!< Estimation possible -> valid trajectory present
ITASampleFrame* psfOutput; //!< Accumulated listener output signals
ITAAudiofileWriter* pListenerOutputAudioFileWriter; //!< File writer used for dumping the listener signals
ITABufferedAudiofileWriter* pListenerOutputAudioFileWriter; //!< File writer used for dumping the listener signals
void PreRequest()
{
......@@ -261,7 +261,8 @@ protected:
props.eQuantization = ITAQuantization::ITA_FLOAT;
props.iChannels = 2;
props.iLength = 0;
pListenerOutputAudioFileWriter = ITABufferedAudiofileWriter::create( sOutput, props );
pListenerOutputAudioFileWriter = ITABufferedAudiofileWriter::create( props );
pListenerOutputAudioFileWriter->SetFilePath( sOutput );
}
void FinalizeDump()
......
# $Id:$
set( RelativeDir "src/Rendering/Ambisonics/Freefield" )
set( RelativeSourceGroup "Source Files\\Rendering\\Ambisonics\\Freefield" )
set( RelativeSourceGroup "src\\Rendering\\Ambisonics\\Freefield" )
set( DirFiles
VAAmbisonicsFreefieldAudioRenderer.cpp
......
# $Id:$
set( RelativeDir "src/Rendering/Ambisonics" )
set( RelativeSourceGroup "Source Files\\Rendering\\Ambisonics" )
set( RelativeSourceGroup "src\\Rendering\\Ambisonics" )
set( SubDirs Freefield )
set( DirFiles
......
......@@ -30,7 +30,7 @@
#include "../../../Scene/VAScene.h"
#include "../../../Utils/VAUtils.h"
#include "../../../VAAudiostreamTracker.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VACoreConfig.h"
#include "../../../VALog.h"
......
......@@ -26,7 +26,7 @@
#include "../../../Rendering/VAAudioRendererRegistry.h"
#include "../../../Scene/VAScene.h"
#include "../../../VASourceListenerMetrics.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
// ITA includes
#include <ITADataSourceRealization.h>
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/AirTrafficNoise" )
set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\AirTrafficNoise" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\AirTrafficNoise" )
set( DirFiles
VAAirTrafficNoiseAudioRenderer.cpp
......
......@@ -25,7 +25,7 @@
#include "../../../Utils/VAUtils.h"
#include "../../../VAAudiostreamTracker.h"
#include "../../../VACoreConfig.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VALog.h"
#include <VAObjectPool.h>
#include <VAReferenceableObject.h>
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/ArtificialReverb" )
set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\ArtificialReverb" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\ArtificialReverb" )
set( DirFiles
VABinauralArtificialReverb.cpp
......
......@@ -29,7 +29,7 @@
#include "../../../Scene/VAScene.h"
#include "../../../Utils/VAUtils.h"
#include "../../../VAAudiostreamTracker.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VACoreConfig.h"
#include "../../../VALog.h"
#include <VAObjectPool.h>
......@@ -1094,8 +1094,6 @@ void CVABinauralFreeFieldAudioRenderer::ResetInternalData()
void CVABinauralFreeFieldAudioRenderer::UpdateSoundPaths()
{
const int iGlobalAuralisationMode = m_iCurGlobalAuralizationMode;
// Check for new data
std::list< CVABFFSoundPath* >::iterator it = m_lSoundPaths.begin();
while( it != m_lSoundPaths.end() )
......@@ -1483,7 +1481,7 @@ CVAStruct CVABinauralFreeFieldAudioRenderer::CallObject( const CVAStruct& oArgs
CVAConfigInterpreter oConfig( oArgs );
std::string sCommandOrg;
oConfig.ReqNonEmptyString( "Command", sCommandOrg );
oConfig.OptString( "Command", sCommandOrg );
std::string sCommand = toUppercase( sCommandOrg );
// Command resolution
......@@ -1502,7 +1500,7 @@ CVAStruct CVABinauralFreeFieldAudioRenderer::CallObject( const CVAStruct& oArgs
return oReturn;
}
VA_EXCEPT2( INVALID_PARAMETER, "Invalid command (\"" + sCommandOrg + "\")" );
return oReturn;
}
void CVABinauralFreeFieldAudioRenderer::SetParameters( const CVAStruct& oParams )
......
......@@ -26,7 +26,7 @@
#include "../../VAAudioRendererRegistry.h"
#include "../../../Scene/VAScene.h"
#include "../../../VASourceListenerMetrics.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
// ITA includes
#include <ITABufferedAudioFileWriter.h>
......@@ -220,7 +220,7 @@ protected:
bool bValidTrajectoryPresent; //!< Estimation possible -> valid trajectory present
ITASampleFrame* psfOutput; //!< Accumulated listener output signals
ITAAudiofileWriter* pListenerOutputAudioFileWriter; //!< File writer used for dumping the listener signals
ITABufferedAudiofileWriter* pListenerOutputAudioFileWriter; //!< File writer used for dumping the listener signals
inline void PreRequest()
{
......@@ -261,7 +261,8 @@ protected:
props.eQuantization = ITAQuantization::ITA_FLOAT;
props.iChannels = 2;
props.iLength = 0;
pListenerOutputAudioFileWriter = ITABufferedAudiofileWriter::create( sOutput, props );
pListenerOutputAudioFileWriter = ITABufferedAudiofileWriter::create( props );
pListenerOutputAudioFileWriter->SetFilePath( sOutput );
};
inline void FinalizeDump()
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/FreeField" )
set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\FreeField" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\FreeField" )
set( DirFiles
VABinauralFreeFieldAudioRenderer.cpp
......
......@@ -30,7 +30,7 @@
#include "../../../Scene/VAScene.h"
#include "../../../Utils/VAUtils.h"
#include "../../../VAAudiostreamTracker.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VACoreConfig.h"
#include "../../../VALog.h"
......
......@@ -28,7 +28,7 @@
#include "../../../Motion/VASharedMotionModel.h"
#include "../../../Scene/VAScene.h"
#include "../../../VASourceListenerMetrics.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
// ITA includes
#include <ITADataSourceRealization.h>
......
set( RelativeDir "src/Rendering/Binaural/OutdoorNoise" )
set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\OutdoorNoise" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\OutdoorNoise" )
set( DirFiles
VABinauralOutdoorNoiseAudioRenderer.cpp
......
......@@ -24,12 +24,13 @@
#include <VAInterface.h>
#include <VAObjectPool.h>
#include "../../../Utils/VADebug.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VALog.h"
#include "../../../VALockfreeObjectPool.h"
#include "../../../VASourceListenerMetrics.h"
#include "../../../directivities/VADirectivity.h"
#include "../../../directivities/VADirectivityDAFFHRIR.h"
#include "../../../directivities/VADirectivityDAFFEnergetic.h"
#include "../../../Filtering/VAAtmosphere.h"
#include "../../../Motion/VAMotionModelBase.h"
#include "../../../Motion/VASampleAndHoldMotionModel.h"
......@@ -938,10 +939,9 @@ void ComplexSoundPath::UpdateMetrics()
void ComplexSoundPath::UpdateDir()
{
// Neuen Status bestimmen
DAFFContentMS* pDirectivityData = ( DAFFContentMS* ) oDirectivityStateNew.pData;
CVADirectivityDAFFEnergetic* pDirectivityData = ( CVADirectivityDAFFEnergetic* ) oDirectivityStateNew.pData;
if( pDirectivityData != nullptr )
pDirectivityData->getNearestNeighbour( DAFF_OBJECT_VIEW,
float( oRelations.dAzimuthS2L ), float( oRelations.dElevationS2L ), oDirectivityStateNew.iRecord );
pDirectivityData->GetNearestNeighbour( float( oRelations.dAzimuthS2L ), float( oRelations.dElevationS2L ), &oDirectivityStateNew.iRecord );
else
oDirectivityStateNew.iRecord = -1;
......@@ -957,7 +957,7 @@ void ComplexSoundPath::UpdateDir()
else {
int iChannel = 0;
std::vector< float > vfMags( oDirMags.GetNumBands() );
pDirectivityData->getMagnitudes( oDirectivityStateNew.iRecord, iChannel, &vfMags[ 0 ] );
pDirectivityData->GetDAFFContent()->getMagnitudes( oDirectivityStateNew.iRecord, iChannel, &vfMags[ 0 ] );
oDirMags.SetMagnitudes( vfMags );
}
m_csTOMagsDir.leave();
......
......@@ -19,7 +19,7 @@
#include "VARoomAcousticsScheduler.h"
// VA includes
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VALog.h"
#include "../../../Utils/VADebug.h"
#include "../../../Utils/VAUtils.h"
......
......@@ -19,7 +19,7 @@
#include "VARoomAcousticsScheduler.h"
// VA includes
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VALog.h"
#include "../../../Utils/VADebug.h"
#include "../../../Utils/VAUtils.h"
......
......@@ -19,7 +19,7 @@
#include "VARoomAcousticsScheduler.h"
// VA includes
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VALog.h"
#include "../../../Utils/VADebug.h"
#include "../../../Utils/VAUtils.h"
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural/RoomAcoustics" )
set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\RoomAcoustics" )
set( RelativeSourceGroup "src\\Rendering\\Binaural\\RoomAcoustics" )
set( DirFiles
VARoomAcousticsAudioRenderer.cpp
......
# $Id:$
set( RelativeDir "src/Rendering/Binaural" )
set( RelativeSourceGroup "Source Files\\Rendering\\Binaural" )
set( SubDirs AirTrafficNoise ArtificialReverb FreeField RealTime OutdoorNoise RoomAcoustics )
set( RelativeSourceGroup "src\\Rendering\\Binaural" )
set( SubDirs AirTrafficNoise ArtificialReverb FreeField OutdoorNoise RealTime RoomAcoustics )
set( DirFiles
_SourceFiles.cmake
......
......@@ -15,7 +15,7 @@
// VA includes
#include "../../../Utils/VAUtils.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VAHardwareSetup.h"
#ifdef VACORE_WITH_RENDERER_PROTOTYPE_DUMMY
......
# $Id:$
set( RelativeDir "src/Rendering/Prototyping/Dummy" )
set( RelativeSourceGroup "Source Files\\Rendering\\Prototyping\\Dummy" )
set( RelativeSourceGroup "src\\Rendering\\Prototyping\\Dummy" )
set( DirFiles
VAPTDummyAudioRenderer.cpp
......
......@@ -28,7 +28,7 @@
#include "../../../Scene/VAScene.h"
#include "../../../Utils/VAUtils.h"
#include "../../../VAAudiostreamTracker.h"
#include "../../../VACoreImpl.h"
#include "../../../core/core.h"
#include "../../../VACoreConfig.h"
#include "../../../VALog.h"
......@@ -920,7 +920,8 @@ CVAPrototypeFreeFieldAudioRenderer::CVAPFFReceiver* CVAPrototypeFreeFieldAudioRe
props.eQuantization = ITAQuantization::ITA_FLOAT;
props.iChannels = m_iRecordSoundReceiversNumChannels;
props.iLength = 0;
pListener->pListenerOutputAudioFileWriter = ITABufferedAudiofileWriter::create( sFileBaseName, props );
pListener->pListenerOutputAudioFileWriter = ITABufferedAudiofileWriter::create( props );
pListener->pListenerOutputAudioFileWriter->SetFilePath( sFileBaseName );
VA_INFO( "PrototypeFreeFieldAudioRenderer", "Will record listener output signal and export to file '" << sFileBaseName << "' using " << m_iRecordSoundReceiversNumChannels << " channels after deletion" );
}
......