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

Reverting all cubicspline default switching algorithms to linear, since this...

Reverting all cubicspline default switching algorithms to linear, since this is enough quality and there appears to be a bug in the interpolation routine (tbd)
parent 9624337b
......@@ -342,7 +342,11 @@ if( ITA_VACORE_DEPLOY_WITH_COMMON_DATA )
endif( )
if( ITA_VACORE_DEPLOY_WITH_COMMON_CONFIGS )
install( DIRECTORY "conf" DESTINATION "." FILES_MATCHING PATTERN "*.ini" )
if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conf/${ITA_VACORE_DEFAULT_CONFIG_FILE_NAME}" )
install( DIRECTORY "conf" DESTINATION "." FILES_MATCHING PATTERN "*.ini" )
else()
message( "conf/VACore.ini exists, skipping overwrite. Manually remove generated conf/VACore.ini first, if you want to re-generate from default prototype config file." )
endif()
endif( )
if( ITA_VACORE_DEPLOY_WITH_COMMON_SCRIPTS )
......
......@@ -121,6 +121,7 @@ MotionModelLogInputSources = false
MotionModelLogEstimatedOutputSources = false
MotionModelLogInputListener = false
MotionModelLogEstimatedOutputListener = false
SwitchingAlgorithm = linear
[Renderer:MyAmbientMixer]
class = AmbientMixer
......@@ -175,7 +176,7 @@ MotionModelLogEstimatedOutputSources = false
DumpListeners = false
DumpListenersGain = 1.0
SpeedOfSound = 344.0
SwitchingAlgorithm = cubicspline
SwitchingAlgorithm = linear
[Renderer:MyHearingAidRenderer]
Class = PrototypeHearingAid
......
......@@ -75,14 +75,16 @@ class IVAInterpolationRoutine;
* - Wächst automatisch mit Setzen der Verzögerung
*/
class CVAVariableDelayLine {
class CVAVariableDelayLine
{
public:
//! Umsetzung der Verzögerungsänderung
/**
* Auflistung der Algorithmen, die zur Umsetzung einer Verzögerungsänderung
* zur Verfügung stehen.
*/
enum SwitchingAlgorithm {
enum SwitchingAlgorithm
{
SWITCH = 0, //!< Hartes umschalten
CROSSFADE, //!< Überblenden im Zeitbereich mittels Kreuzblende (Kosinus-Quadrat)
LINEAR_INTERPOLATION, //!< Stauchen und Strecken im Zeitbereich durch lineare Interpolation (Polynominterpolation der Ordnung 1)
......@@ -97,10 +99,7 @@ public:
* \param fReservedMaxDelaySamples Initiale maximale Verzögerung [Anzahl Samples]
* \param iAlgorithm Algorithmus (siehe #SwitchingAlgorithm)
*/
CVAVariableDelayLine(double dSamplerate,
int iBlocklength,
float fReservedMaxDelaySamples,
int iAlgorithm);
CVAVariableDelayLine(double dSamplerate, int iBlocklength, float fReservedMaxDelaySamples, int iAlgorithm);
//! Destruktor der variablen Verzögerungsleitung
~CVAVariableDelayLine();
......
......@@ -321,7 +321,7 @@ void CVABinauralAirTrafficNoiseAudioRenderer::Init( const CVAStruct& oArgs )
conf.OptNumber( "GroundPlanePosition", m_dGroundPlanePosition, 0.0f );
std::string sVLDInterpolationAlgorithm;
conf.OptString( "SwitchingAlgorithm", sVLDInterpolationAlgorithm, "cubicspline" );
conf.OptString( "SwitchingAlgorithm", sVLDInterpolationAlgorithm, "linear" );
sVLDInterpolationAlgorithm = toLowercase( sVLDInterpolationAlgorithm );
if( sVLDInterpolationAlgorithm == "switch" )
......
......@@ -251,7 +251,7 @@ void CVABinauralArtificialReverbAudioRenderer::Init( const CVAStruct& oArgs )
conf.OptNumber( "SpeedOfSound", m_dSpeedOfSound, 344.0f );
std::string sVLDInterpolationAlgorithm;
conf.OptString( "VDLSwitchingAlgorithm", sVLDInterpolationAlgorithm, "cubicspline" );
conf.OptString( "VDLSwitchingAlgorithm", sVLDInterpolationAlgorithm, "linear" );
sVLDInterpolationAlgorithm = toLowercase( sVLDInterpolationAlgorithm );
if( sVLDInterpolationAlgorithm == "switch" )
......
......@@ -286,7 +286,7 @@ void CVABinauralFreeFieldAudioRenderer::Init( const CVAStruct& oArgs )
conf.OptNumber( "SpeedOfSound", m_dSpeedOfSound, 344.0f );
std::string sVLDInterpolationAlgorithm;
conf.OptString( "SwitchingAlgorithm", sVLDInterpolationAlgorithm, "cubicspline" );
conf.OptString( "SwitchingAlgorithm", sVLDInterpolationAlgorithm, "linear" );
sVLDInterpolationAlgorithm = toLowercase( sVLDInterpolationAlgorithm );
if( sVLDInterpolationAlgorithm == "switch" )
......
......@@ -860,7 +860,8 @@ void ComplexSoundPath::ExchangeFilter()
}
bool bDiffuseDecayEnabled = (iPathAuralizationMode & IVACore::VA_AURAMODE_DIFFUSE_DECAY) > 0;
if( bDiffuseDecayEnabled ) {
if( bDiffuseDecayEnabled )
{
assert( sfRIRDiffuseDecayPart.length() <= sfRIRTemp.length() );
m_csRIRDiffuseDecayAssembly.enter();
if( false )
......@@ -1650,9 +1651,9 @@ void CVARoomAcousticsAudioRenderer::ProcessStream( const ITAStreamInfo* pStreamI
pTaskDS->iListenerID = pPath->pListener->pData->iID;
pTaskIS->iListenerID = pPath->pListener->pData->iID;
pTaskRT->iListenerID = pPath->pListener->pData->iID;
pTaskDS->oProfiler.dCreationTime = pStreamInfo->dTimecode;
pTaskIS->oProfiler.dCreationTime = pStreamInfo->dTimecode;
pTaskRT->oProfiler.dCreationTime = pStreamInfo->dTimecode;
pTaskDS->oProfiler.dCreationTime = pStreamInfo->dSysTimeCode;
pTaskIS->oProfiler.dCreationTime = pStreamInfo->dSysTimeCode;
pTaskRT->oProfiler.dCreationTime = pStreamInfo->dSysTimeCode;
if (pTaskDS->iAuralisationMode != m_iCurGlobalAuralizationMode)
pTaskDS->iAuralisationMode = m_iCurGlobalAuralizationMode;
if (pTaskIS->iAuralisationMode != m_iCurGlobalAuralizationMode)
......
......@@ -248,7 +248,7 @@ void CVAMonauralFreeFieldAudioRenderer::Init( const CVAStruct& oArgs )
conf.OptNumber( "SpeedOfSound", m_dSpeedOfSound, 344.0f );
std::string sVLDInterpolationAlgorithm;
conf.OptString( "SwitchingAlgorithm", sVLDInterpolationAlgorithm, "cubicspline" );
conf.OptString( "SwitchingAlgorithm", sVLDInterpolationAlgorithm, "linear" );
sVLDInterpolationAlgorithm = toLowercase( sVLDInterpolationAlgorithm );
if( sVLDInterpolationAlgorithm == "switch" )
......
......@@ -332,7 +332,7 @@ void CVAPTHearingAidRenderer::Init( const CVAStruct& oArgs )
// interpolation algorithm
std::string sVLDInterpolationAlgorithm;
conf.OptString( "SwitchingAlgorithm", sVLDInterpolationAlgorithm, "cubicspline" );
conf.OptString( "SwitchingAlgorithm", sVLDInterpolationAlgorithm, "linear" );
sVLDInterpolationAlgorithm = toLowercase( sVLDInterpolationAlgorithm );
if( sVLDInterpolationAlgorithm == "switch" )
......
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