Commit 0cc3b108 authored by Jonas Stienen's avatar Jonas Stienen
Browse files

API changes in ITACTC

parent 24de9ee3
......@@ -778,8 +778,8 @@ void CVABinauralAirTrafficNoiseAudioRenderer::ProcessStream( const ITAStreamInfo
pPath->oRefSoundPath.oThirdOctaveFilterMagnitudes.Multiply( pPath->oRefSoundPath.oDirectivityMagnitudes );
pPath->oDirSoundPath.oThirdOctaveFilterMagnitudes.Multiply( pPath->oDirSoundPath.oTemporalVariationMagnitudes );
pPath->oRefSoundPath.oThirdOctaveFilterMagnitudes.Multiply( pPath->oRefSoundPath.oTemporalVariationMagnitudes );
pPath->oDirSoundPath.pThirdOctaveFilterBank->SetGains( pPath->oDirSoundPath.oThirdOctaveFilterMagnitudes );
pPath->oRefSoundPath.pThirdOctaveFilterBank->SetGains( pPath->oRefSoundPath.oThirdOctaveFilterMagnitudes );
pPath->oDirSoundPath.pThirdOctaveFilterBank->SetMagnitudes( pPath->oDirSoundPath.oThirdOctaveFilterMagnitudes );
pPath->oRefSoundPath.pThirdOctaveFilterBank->SetMagnitudes( pPath->oRefSoundPath.oThirdOctaveFilterMagnitudes );
// Digital signal processing
......@@ -1272,7 +1272,7 @@ void CVABATNSoundPath::UpdateDir( bool bDIRAuraModeEnabled )
CITAThirdOctaveMagnitudeSpectrum oDirectivityMagnitudes;
oDirectivityMagnitudes.SetMagnitudes( vfGains );
oDirSoundPath.pThirdOctaveFilterBank->SetGains( oDirectivityMagnitudes );
oDirSoundPath.pThirdOctaveFilterBank->SetMagnitudes( oDirectivityMagnitudes );
}
}
}
......@@ -1319,7 +1319,7 @@ void CVABATNSoundPath::UpdateDir( bool bDIRAuraModeEnabled )
CITAThirdOctaveMagnitudeSpectrum oDirectivityMagnitudes;
oDirectivityMagnitudes.SetMagnitudes( vfGains );
oRefSoundPath.pThirdOctaveFilterBank->SetGains( oDirectivityMagnitudes );
oRefSoundPath.pThirdOctaveFilterBank->SetMagnitudes( oDirectivityMagnitudes );
}
}
}
......
......@@ -1201,7 +1201,7 @@ void CVABFFSoundPath::UpdateDir( bool bDIRAuraModeEnabled )
pDirectivityDataNew->getMagnitudes( oDirectivityStateNew.iRecord, 0, &vfMags[ 0 ] );
CITAThirdOctaveMagnitudeSpectrum oDirectivityMagnitudes;
oDirectivityMagnitudes.SetMagnitudes( vfMags );
pThirdOctaveFilterBank->SetGains( oDirectivityMagnitudes );
pThirdOctaveFilterBank->SetMagnitudes( oDirectivityMagnitudes );
}
}
}
......
......@@ -1132,7 +1132,7 @@ void CVAMFFSoundPath::UpdateDir( bool bDIRAuraModeEnabled )
std::vector< float > vfMags( oDirectivityMagnitudes.GetNumBands() );
pDirectivityDataNew->getMagnitudes( oDirectivityStateNew.iRecord, 0, &vfMags[ 0 ] );
oDirectivityMagnitudes.SetMagnitudes( vfMags );
pThirdOctaveFilterBank->SetGains( oDirectivityMagnitudes );
pThirdOctaveFilterBank->SetMagnitudes( oDirectivityMagnitudes );
}
}
}
......
......@@ -46,7 +46,7 @@ CVANCTCReproduction::CVANCTCReproduction( const CVAAudioReproductionModuleInitPa
// NCTC configuration
ITANCTC::Config oNCTCConf;
conf.OptInteger( "CTCFilterLength", oNCTCConf.iCTCFilterLength, 4096 );
oNCTCConf.dSampleRate = m_oParams.pCore->GetCoreConfig()->oAudioDriverConfig.dSampleRate;
oNCTCConf.fSampleRate = float( m_oParams.pCore->GetCoreConfig()->oAudioDriverConfig.dSampleRate );
double dSpeedOfSound;
conf.OptNumber( "SpeedOfSound", dSpeedOfSound, 340.0f );
oNCTCConf.fSpeedOfSound = float( dSpeedOfSound );
......@@ -91,7 +91,7 @@ CVANCTCReproduction::CVANCTCReproduction( const CVAAudioReproductionModuleInitPa
}
}
m_vpSpectra.push_back( new ITAHDFTSpectra( oNCTCConf.dSampleRate, 2, oNCTCConf.iCTCFilterLength+1, true ) );
m_vpSpectra.push_back( new ITAHDFTSpectra( oNCTCConf.fSampleRate, 2, oNCTCConf.iCTCFilterLength+1, true ) );
}
#ifdef VACORE_REPRODUCTION_NCTC_WITH_SWEET_SPOT_WIDENING
......@@ -112,7 +112,7 @@ CVANCTCReproduction::CVANCTCReproduction( const CVAAudioReproductionModuleInitPa
int iDelaySamples;
conf.OptInteger( "DelaySamples", iDelaySamples, oNCTCConf.iCTCFilterLength / 2 );
m_pNCTC->SetDelayTime( float( iDelaySamples / oNCTCConf.dSampleRate ) );
m_pNCTC->SetDelayTime( float( iDelaySamples / oNCTCConf.fSampleRate ) );
// NCTC Stream filter
ITANCTCStreamFilter::Config oNCTCStreamConf;
......
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