Skip to content
GitLab
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
0cc3b108
Commit
0cc3b108
authored
Jun 13, 2017
by
Jonas Stienen
Browse files
API changes in ITACTC
parent
24de9ee3
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/Rendering/Binaural/AirTrafficNoise/VAAirTrafficNoiseAudioRenderer.cpp
View file @
0cc3b108
...
...
@@ -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
->
Set
Gain
s
(
pPath
->
oDirSoundPath
.
oThirdOctaveFilterMagnitudes
);
pPath
->
oRefSoundPath
.
pThirdOctaveFilterBank
->
Set
Gain
s
(
pPath
->
oRefSoundPath
.
oThirdOctaveFilterMagnitudes
);
pPath
->
oDirSoundPath
.
pThirdOctaveFilterBank
->
Set
Magnitude
s
(
pPath
->
oDirSoundPath
.
oThirdOctaveFilterMagnitudes
);
pPath
->
oRefSoundPath
.
pThirdOctaveFilterBank
->
Set
Magnitude
s
(
pPath
->
oRefSoundPath
.
oThirdOctaveFilterMagnitudes
);
// Digital signal processing
...
...
@@ -1272,7 +1272,7 @@ void CVABATNSoundPath::UpdateDir( bool bDIRAuraModeEnabled )
CITAThirdOctaveMagnitudeSpectrum
oDirectivityMagnitudes
;
oDirectivityMagnitudes
.
SetMagnitudes
(
vfGains
);
oDirSoundPath
.
pThirdOctaveFilterBank
->
Set
Gain
s
(
oDirectivityMagnitudes
);
oDirSoundPath
.
pThirdOctaveFilterBank
->
Set
Magnitude
s
(
oDirectivityMagnitudes
);
}
}
}
...
...
@@ -1319,7 +1319,7 @@ void CVABATNSoundPath::UpdateDir( bool bDIRAuraModeEnabled )
CITAThirdOctaveMagnitudeSpectrum
oDirectivityMagnitudes
;
oDirectivityMagnitudes
.
SetMagnitudes
(
vfGains
);
oRefSoundPath
.
pThirdOctaveFilterBank
->
Set
Gain
s
(
oDirectivityMagnitudes
);
oRefSoundPath
.
pThirdOctaveFilterBank
->
Set
Magnitude
s
(
oDirectivityMagnitudes
);
}
}
}
...
...
src/Rendering/Binaural/FreeField/VABinauralFreeFieldAudioRenderer.cpp
View file @
0cc3b108
...
...
@@ -1201,7 +1201,7 @@ void CVABFFSoundPath::UpdateDir( bool bDIRAuraModeEnabled )
pDirectivityDataNew
->
getMagnitudes
(
oDirectivityStateNew
.
iRecord
,
0
,
&
vfMags
[
0
]
);
CITAThirdOctaveMagnitudeSpectrum
oDirectivityMagnitudes
;
oDirectivityMagnitudes
.
SetMagnitudes
(
vfMags
);
pThirdOctaveFilterBank
->
Set
Gain
s
(
oDirectivityMagnitudes
);
pThirdOctaveFilterBank
->
Set
Magnitude
s
(
oDirectivityMagnitudes
);
}
}
}
...
...
src/Rendering/Monaural/FreeField/VAMonauralFreeFieldAudioRenderer.cpp
View file @
0cc3b108
...
...
@@ -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
->
Set
Gain
s
(
oDirectivityMagnitudes
);
pThirdOctaveFilterBank
->
Set
Magnitude
s
(
oDirectivityMagnitudes
);
}
}
}
...
...
src/Reproduction/Binaural/VANCTCReproduction.cpp
View file @
0cc3b108
...
...
@@ -46,7 +46,7 @@ CVANCTCReproduction::CVANCTCReproduction( const CVAAudioReproductionModuleInitPa
// NCTC configuration
ITANCTC
::
Config
oNCTCConf
;
conf
.
OptInteger
(
"CTCFilterLength"
,
oNCTCConf
.
iCTCFilterLength
,
4096
);
oNCTCConf
.
d
SampleRate
=
m_oParams
.
pCore
->
GetCoreConfig
()
->
oAudioDriverConfig
.
dSampleRate
;
oNCTCConf
.
f
SampleRate
=
float
(
m_oParams
.
pCore
->
GetCoreConfig
()
->
oAudioDriverConfig
.
dSampleRate
)
;
double
dSpeedOfSound
;
conf
.
OptNumber
(
"SpeedOfSound"
,
dSpeedOfSound
,
340.0
f
);
oNCTCConf
.
fSpeedOfSound
=
float
(
dSpeedOfSound
);
...
...
@@ -91,7 +91,7 @@ CVANCTCReproduction::CVANCTCReproduction( const CVAAudioReproductionModuleInitPa
}
}
m_vpSpectra
.
push_back
(
new
ITAHDFTSpectra
(
oNCTCConf
.
d
SampleRate
,
2
,
oNCTCConf
.
iCTCFilterLength
+
1
,
true
)
);
m_vpSpectra
.
push_back
(
new
ITAHDFTSpectra
(
oNCTCConf
.
f
SampleRate
,
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
.
d
SampleRate
)
);
m_pNCTC
->
SetDelayTime
(
float
(
iDelaySamples
/
oNCTCConf
.
f
SampleRate
)
);
// NCTC Stream filter
ITANCTCStreamFilter
::
Config
oNCTCStreamConf
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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