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

Fixing bug in air traffic noise renderer, still not binaural though

parent 8719b7e6
......@@ -155,6 +155,7 @@ public:
inline PropPath()
: dPropagationTime( 0.0f )
, dGeometricalSpreadingLoss( 1.0f )
, pVariableDelayLine( NULL )
, pThirdOctaveFilterBank( NULL )
, pFIRConvolverChL( NULL )
......@@ -865,12 +866,14 @@ void CVABinauralAirTrafficNoiseAudioRenderer::ProcessStream( const ITAStreamInfo
pPath->oDirSoundPath.pThirdOctaveFilterBank->Process( ctxAudio.m_sbTempBufD.data(), ctxAudio.m_sbTempBufD.data() ); // inplace
pPath->oRefSoundPath.pThirdOctaveFilterBank->Process( ctxAudio.m_sbTempBufR.data(), ctxAudio.m_sbTempBufR.data() ); // inplace
pPath->oDirSoundPath.pFIRConvolverChL->Process( ctxAudio.m_sbTempBufD.data(), ( *pPath->pSoundReceiver->psfOutput )[ 0 ].data(), ITAUPConvolution::OUTPUT_MIX );
pPath->oRefSoundPath.pFIRConvolverChL->Process( ctxAudio.m_sbTempBufR.data(), ( *pPath->pSoundReceiver->psfOutput )[ 0 ].data(), ITAUPConvolution::OUTPUT_MIX );
pPath->oRefSoundPath.pFIRConvolverChL->Process( ctxAudio.m_sbTempBufR.data(), ( *pPath->pSoundReceiver->psfOutput )[ 0 ].data(), ITAUPConvolution::OUTPUT_MIX );
pPath->oDirSoundPath.pFIRConvolverChR->Process( ctxAudio.m_sbTempBufD.data(), ( *pPath->pSoundReceiver->psfOutput )[ 1 ].data(), ITAUPConvolution::OUTPUT_MIX );
pPath->oRefSoundPath.pFIRConvolverChR->Process( ctxAudio.m_sbTempBufR.data(), ( *pPath->pSoundReceiver->psfOutput )[ 1 ].data(), ITAUPConvolution::OUTPUT_MIX );
spit++;
}
......@@ -1234,11 +1237,11 @@ CVABATNSoundPath::CVABATNSoundPath( double dSamplerate, int iBlocklength, int iH
: dGroundReflectionPlanePosition( 0 )
{
oDirSoundPath.pThirdOctaveFilterBank = CITAThirdOctaveFilterbank::Create( dSamplerate, iBlocklength,
//CVAThirdOctaveFilterbank::FIR_SPLINE_LINEAR_PHASE);
CITAThirdOctaveFilterbank::IIR_BIQUADS_ORDER10 );
CITAThirdOctaveFilterbank::FIR_SPLINE_LINEAR_PHASE );
//CITAThirdOctaveFilterbank::IIR_BIQUADS_ORDER10 );
oRefSoundPath.pThirdOctaveFilterBank = CITAThirdOctaveFilterbank::Create( dSamplerate, iBlocklength,
//CVAThirdOctaveFilterbank::FIR_SPLINE_LINEAR_PHASE);
CITAThirdOctaveFilterbank::IIR_BIQUADS_ORDER10 );
CITAThirdOctaveFilterbank::FIR_SPLINE_LINEAR_PHASE );
//CITAThirdOctaveFilterbank::IIR_BIQUADS_ORDER10 );
oDirSoundPath.pThirdOctaveFilterBank->SetIdentity();
oRefSoundPath.pThirdOctaveFilterBank->SetIdentity();
......@@ -1537,10 +1540,12 @@ void CVABATNSoundPath::UpdateSoundReceiverDirectivity()
pHRIRFilterChR->Load( m_sfHRIRTemp[ 1 ].data(), iNewFilterLength );
}
/* searching problem
oRefSoundPath.pFIRConvolverChL->ExchangeFilter( pHRIRFilterChL );
oRefSoundPath.pFIRConvolverChR->ExchangeFilter( pHRIRFilterChR );
oRefSoundPath.pFIRConvolverChL->ReleaseFilter( pHRIRFilterChL );
oRefSoundPath.pFIRConvolverChR->ReleaseFilter( pHRIRFilterChR );
*/
// Ack
oRefSoundPath.oSoundReceiverDirectivityStateCur = oRefSoundPath.oSoundReceiverDirectivityStateNew;
......
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