Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
VACore
Commits
fc71d333
Commit
fc71d333
authored
Jun 28, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Refining usage of third octaves (gain vs. factor vs. decibel)
parent
1159eba3
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/Filtering/VAAtmosphere.cpp
View file @
fc71d333
...
...
@@ -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
};
void
GetAirAbsorptionMagnitudes
(
CITAThirdOctaveMagnitudeSpectrum
&
oMags
,
double
dDistance
,
double
dTemperature
,
double
dPressure
,
double
dHumidity
)
void
GetAirAbsorptionMagnitudes
(
CITAThirdOctave
Factor
MagnitudeSpectrum
&
oMags
,
double
dDistance
,
double
dTemperature
,
double
dPressure
,
double
dHumidity
)
{
// ISO 9613-1 Acoustics - Attenuation of sound during propagation outdoors
...
...
@@ -95,7 +95,7 @@ void GetAirAbsorptionMagnitudes( CITAThirdOctaveMagnitudeSpectrum& oMags, double
}
void
CalculateAirAbsorptionAttenuation
(
CITAThirdOctaveMagnitudeSpectrum
&
oAirAbsMags
,
double
dDistance
,
double
dTemperature
,
double
dStaticPressure
,
double
dHumidity
)
void
CalculateAirAbsorptionAttenuation
(
CITAThirdOctave
Factor
MagnitudeSpectrum
&
oAirAbsMags
,
double
dDistance
,
double
dTemperature
,
double
dStaticPressure
,
double
dHumidity
)
{
std
::
vector
<
float
>
vfGains
(
oAirAbsMags
.
GetNumBands
()
);
GetAirAbsorptionMagnitudesThirdOctave
(
&
vfGains
[
0
],
dDistance
,
dTemperature
,
dStaticPressure
,
dHumidity
);
...
...
src/Filtering/VAAtmosphere.h
View file @
fc71d333
...
...
@@ -52,7 +52,7 @@ void GetAirAbsorptionAttenuationThirdOctaveDecibel( float* pfAirAbsCoeffs, // A
* \param fStaticPressure Statischer Luftdruck [Pa]
* \param fHumidity Luftfeuchtigkeit [%]
*/
void
CalculateAirAbsorptionAttenuation
(
CITAThirdOctaveMagnitudeSpectrum
&
oAirAbsMags
,
double
dDistance
,
double
dTemperature
,
double
dStaticPressure
,
double
dHumidity
);
void
CalculateAirAbsorptionAttenuation
(
CITAThirdOctave
Factor
MagnitudeSpectrum
&
oAirAbsMags
,
double
dDistance
,
double
dTemperature
,
double
dStaticPressure
,
double
dHumidity
);
//! Berechnung der Luftschall-Dmpfung in Terzen als Faktoren (von Jonas implementiert)
/**
...
...
@@ -66,6 +66,6 @@ void CalculateAirAbsorptionAttenuation( CITAThirdOctaveMagnitudeSpectrum& oAirAb
* \param fStaticPressure Statischer Luftdruck [Pa]
* \param fHumidity Luftfeuchtigkeit [%]
*/
void
GetAirAbsorptionMagnitudes
(
CITAThirdOctaveMagnitudeSpectrum
&
oMags
,
double
dDistance
,
double
dTemperature
,
double
dStaticPressure
,
double
dHumidity
);
void
GetAirAbsorptionMagnitudes
(
CITAThirdOctave
Factor
MagnitudeSpectrum
&
oMags
,
double
dDistance
,
double
dTemperature
,
double
dStaticPressure
,
double
dHumidity
);
#endif // __VA_ATMOSPHERE__
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsAudioRenderer.cpp
View file @
fc71d333
...
...
@@ -2235,7 +2235,7 @@ int CVARoomAcousticsAudioRenderer::PostTaskDiscarded( IRavenSimulationSchedulerI
}
}
void
CVARoomAcousticsAudioRenderer
::
GenerateIRFromTOMags
(
const
CITAThirdOctaveMagnitudeSpectrum
&
oMags
,
ITASampleBuffer
&
sbFilter
)
void
CVARoomAcousticsAudioRenderer
::
GenerateIRFromTOMags
(
const
CITAThirdOctave
Gain
MagnitudeSpectrum
&
oMags
,
ITASampleBuffer
&
sbFilter
)
{
float
*
pfData
=
sbFilter
.
data
();
m_csFilterGenerator
.
enter
();
...
...
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsAudioRenderer.h
View file @
fc71d333
...
...
@@ -176,7 +176,7 @@ public:
* Die lnge der Impulsantwort entspricht der Lnge des ITASampleFrame.
* \note Reentrant (blocking wait)
*/
void
GenerateIRFromTOMags
(
const
CITAThirdOctaveMagnitudeSpectrum
&
oMags
,
ITASampleBuffer
&
sbFilter
);
void
GenerateIRFromTOMags
(
const
CITAThirdOctave
Gain
MagnitudeSpectrum
&
oMags
,
ITASampleBuffer
&
sbFilter
);
//! Gibt die Schallmediumsgeschwindigkeit zurck [m/s]
float
GetSpeedOfSound
()
const
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment