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

Refining usage of third octaves (gain vs. factor vs. decibel)

parent 1159eba3
...@@ -22,7 +22,7 @@ const float DEF_CENTER_FREQUENCY_THIRDS[ 31 ] = ...@@ -22,7 +22,7 @@ const float DEF_CENTER_FREQUENCY_THIRDS[ 31 ] =
1000, 1250, 1600, 2000, 2500, 3150, 4000, 5000, 6300, 8000, 10000, 12500, 16000, 20000 1000, 1250, 1600, 2000, 2500, 3150, 4000, 5000, 6300, 8000, 10000, 12500, 16000, 20000
}; };
void GetAirAbsorptionMagnitudes( CITAThirdOctaveMagnitudeSpectrum& oMags, double dDistance, double dTemperature, double dPressure, double dHumidity ) void GetAirAbsorptionMagnitudes( CITAThirdOctaveFactorMagnitudeSpectrum& oMags, double dDistance, double dTemperature, double dPressure, double dHumidity )
{ {
// ISO 9613-1 Acoustics - Attenuation of sound during propagation outdoors // ISO 9613-1 Acoustics - Attenuation of sound during propagation outdoors
...@@ -95,7 +95,7 @@ void GetAirAbsorptionMagnitudes( CITAThirdOctaveMagnitudeSpectrum& oMags, double ...@@ -95,7 +95,7 @@ void GetAirAbsorptionMagnitudes( CITAThirdOctaveMagnitudeSpectrum& oMags, double
} }
void CalculateAirAbsorptionAttenuation( CITAThirdOctaveMagnitudeSpectrum& oAirAbsMags, double dDistance, double dTemperature, double dStaticPressure, double dHumidity ) void CalculateAirAbsorptionAttenuation( CITAThirdOctaveFactorMagnitudeSpectrum& oAirAbsMags, double dDistance, double dTemperature, double dStaticPressure, double dHumidity )
{ {
std::vector< float > vfGains( oAirAbsMags.GetNumBands() ); std::vector< float > vfGains( oAirAbsMags.GetNumBands() );
GetAirAbsorptionMagnitudesThirdOctave( &vfGains[ 0 ], dDistance, dTemperature, dStaticPressure, dHumidity ); GetAirAbsorptionMagnitudesThirdOctave( &vfGains[ 0 ], dDistance, dTemperature, dStaticPressure, dHumidity );
......
...@@ -52,7 +52,7 @@ void GetAirAbsorptionAttenuationThirdOctaveDecibel( float* pfAirAbsCoeffs, // A ...@@ -52,7 +52,7 @@ void GetAirAbsorptionAttenuationThirdOctaveDecibel( float* pfAirAbsCoeffs, // A
* \param fStaticPressure Statischer Luftdruck [Pa] * \param fStaticPressure Statischer Luftdruck [Pa]
* \param fHumidity Luftfeuchtigkeit [%] * \param fHumidity Luftfeuchtigkeit [%]
*/ */
void CalculateAirAbsorptionAttenuation( CITAThirdOctaveMagnitudeSpectrum& oAirAbsMags, double dDistance, double dTemperature, double dStaticPressure, double dHumidity ); void CalculateAirAbsorptionAttenuation( CITAThirdOctaveFactorMagnitudeSpectrum& oAirAbsMags, double dDistance, double dTemperature, double dStaticPressure, double dHumidity );
//! Berechnung der Luftschall-Dmpfung in Terzen als Faktoren (von Jonas implementiert) //! Berechnung der Luftschall-Dmpfung in Terzen als Faktoren (von Jonas implementiert)
/** /**
...@@ -66,6 +66,6 @@ void CalculateAirAbsorptionAttenuation( CITAThirdOctaveMagnitudeSpectrum& oAirAb ...@@ -66,6 +66,6 @@ void CalculateAirAbsorptionAttenuation( CITAThirdOctaveMagnitudeSpectrum& oAirAb
* \param fStaticPressure Statischer Luftdruck [Pa] * \param fStaticPressure Statischer Luftdruck [Pa]
* \param fHumidity Luftfeuchtigkeit [%] * \param fHumidity Luftfeuchtigkeit [%]
*/ */
void GetAirAbsorptionMagnitudes( CITAThirdOctaveMagnitudeSpectrum& oMags, double dDistance, double dTemperature, double dStaticPressure, double dHumidity ); void GetAirAbsorptionMagnitudes( CITAThirdOctaveFactorMagnitudeSpectrum& oMags, double dDistance, double dTemperature, double dStaticPressure, double dHumidity );
#endif // __VA_ATMOSPHERE__ #endif // __VA_ATMOSPHERE__
...@@ -2235,7 +2235,7 @@ int CVARoomAcousticsAudioRenderer::PostTaskDiscarded( IRavenSimulationSchedulerI ...@@ -2235,7 +2235,7 @@ int CVARoomAcousticsAudioRenderer::PostTaskDiscarded( IRavenSimulationSchedulerI
} }
} }
void CVARoomAcousticsAudioRenderer::GenerateIRFromTOMags( const CITAThirdOctaveMagnitudeSpectrum& oMags, ITASampleBuffer& sbFilter ) void CVARoomAcousticsAudioRenderer::GenerateIRFromTOMags( const CITAThirdOctaveGainMagnitudeSpectrum& oMags, ITASampleBuffer& sbFilter )
{ {
float* pfData = sbFilter.data(); float* pfData = sbFilter.data();
m_csFilterGenerator.enter(); m_csFilterGenerator.enter();
......
...@@ -176,7 +176,7 @@ public: ...@@ -176,7 +176,7 @@ public:
* Die lnge der Impulsantwort entspricht der Lnge des ITASampleFrame. * Die lnge der Impulsantwort entspricht der Lnge des ITASampleFrame.
* \note Reentrant (blocking wait) * \note Reentrant (blocking wait)
*/ */
void GenerateIRFromTOMags( const CITAThirdOctaveMagnitudeSpectrum& oMags, ITASampleBuffer& sbFilter ); void GenerateIRFromTOMags( const CITAThirdOctaveGainMagnitudeSpectrum& oMags, ITASampleBuffer& sbFilter );
//! Gibt die Schallmediumsgeschwindigkeit zurck [m/s] //! Gibt die Schallmediumsgeschwindigkeit zurck [m/s]
float GetSpeedOfSound() const; float GetSpeedOfSound() const;
......
Supports Markdown
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