Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
VACore
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
VACore
Commits
b9c8a01c
Commit
b9c8a01c
authored
Oct 12, 2018
by
Lucas Moesch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed initial source trajectories.
parent
789f3d32
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
74 additions
and
41 deletions
+74
-41
conf/VACore.recording.ini
conf/VACore.recording.ini
+18
-8
src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/VABinauralCluster.cpp
...ealTime/Utils/BinauralClusterEngine/VABinauralCluster.cpp
+5
-1
src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/VABinauralClusterEngine.cpp
...e/Utils/BinauralClusterEngine/VABinauralClusterEngine.cpp
+0
-6
src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/VABinauralClustering.cpp
...Time/Utils/BinauralClusterEngine/VABinauralClustering.cpp
+8
-12
src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/VABinauralClusteringState.cpp
...Utils/BinauralClusterEngine/VABinauralClusteringState.cpp
+1
-1
src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource/VABinauralSoundSource.cpp
...lTime/Utils/BinauralSoundSource/VABinauralSoundSource.cpp
+2
-0
src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource/VABinauralSoundSource.h
...ealTime/Utils/BinauralSoundSource/VABinauralSoundSource.h
+1
-0
src/Rendering/Binaural/RealTime/Utils/Config/VAConfig.cpp
src/Rendering/Binaural/RealTime/Utils/Config/VAConfig.cpp
+2
-1
src/Rendering/Binaural/RealTime/Utils/Config/VAConfig.h
src/Rendering/Binaural/RealTime/Utils/Config/VAConfig.h
+1
-0
src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.cpp
...endering/Binaural/RealTime/VABinauralRealTimeRenderer.cpp
+35
-11
src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.h
src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.h
+1
-1
No files found.
conf/VACore.recording.ini
View file @
b9c8a01c
...
...
@@ -34,21 +34,31 @@ Samplerate = 44100
Buffersize
=
64
OutputChannels
=
2
[Renderer:MyBinauralRealTime]
Class
=
BinauralRealTime
Enabled
=
true
Reproductions
=
MyTalkthroughHeadphones
RecordOutputEnabled
=
true
RecordOutputFilePath
=
BinauralRealTime_rendering.wav
[Renderer:MyBinauralFreeField]
Class
=
BinauralFreeField
Enabled
=
true
Reproductions
=
MyHeadphones
Reproductions
=
My
Talkthrough
Headphones
RecordOutputEnabled
=
true
RecordOutputFilePath
=
$(ProjectName)
_rendering.wav
RecordOutputFilePath
=
BinauralFreeField
_rendering.wav
[Reproduction:MyHeadphones]
Class
=
Headphones
[Reproduction:My
Talkthrough
Headphones]
Class
=
Talkthrough
Enabled
=
true
HpIRInvFile
=
HD650_all_inv.wav
HpIRInvCalibrationGainDecibel
=
0.1
Name
=
Generic talkthrough to output group
Outputs
=
MyDesktopHP
RecordOutputEnabled
=
true
RecordOutputFilePath
=
$(ProjectName)_reproduction.wav
InputDetectorEnabled
=
false
OutputDetectorEnabled
=
false
RecordInputEnabled
=
false
RecordInputFilePath
=
$(ProjectName)_Reproduction_MyTalkthroughHeadphones_Input.wav
RecordOutputEnabled
=
false
RecordOutputFilePath
=
$(ProjectName)_Reproduction_MyTalkthroughHeadphones_Output.wav
[Setup]
[Output:MyDesktopHP]
...
...
src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/VABinauralCluster.cpp
View file @
b9c8a01c
...
...
@@ -124,15 +124,19 @@ VABinauralCluster::getOutput()
sourceMetrics
.
calc
(
_listener
->
predPos
,
_listener
->
predView
,
_listener
->
predUp
,
source
->
predPos
);
double
toaDistance
=
sourceMetrics
.
dist
/
343
;
// TODO: Medium Propagation....
double
toaSourceChL
=
_listener
->
toaEstimator
->
getTOALeft
(
sourceMetrics
.
phi
,
sourceMetrics
.
theta
);
double
toSourceaChR
=
_listener
->
toaEstimator
->
getTOARight
(
sourceMetrics
.
phi
,
sourceMetrics
.
theta
);
float
gain
=
float
(
1
/
sourceMetrics
.
dist
*
source
->
state
->
GetVolume
(
VAConfig
::
amplitudeCalibration
));
source
->
vdlChL
->
SetDelayTime
(
toaDistance
+
toaSourceChL
-
toaHRTFChL
);
source
->
vdlChR
->
SetDelayTime
(
toaDistance
+
toSourceaChR
-
toaHRTFChR
);
source
->
vdlChL
->
Process
(
input
,
&
(
_tmpChL
));
source
->
vdlChR
->
Process
(
input
,
&
(
_tmpChR
));
_tmpChL
.
mul_scalar
(
gain
);
_tmpChR
.
mul_scalar
(
gain
);
(
*
_output
)[
0
]
+=
_tmpChL
;
(
*
_output
)[
1
]
+=
_tmpChR
;
...
...
src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/VABinauralClusterEngine.cpp
View file @
b9c8a01c
...
...
@@ -21,12 +21,6 @@ VABinauralClusterEngine::~VABinauralClusterEngine()
void
VABinauralClusterEngine
::
update
()
{
/* std::map< int, VABinauralClustering* >::iterator it;
for (it = _clusterings.begin(); it != _clusterings.end(); ++it)
{
it->second->update();
}*/
for
(
auto
const
&
clustering
:
_clusterings
)
{
clustering
.
second
->
update
();
...
...
src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/VABinauralClustering.cpp
View file @
b9c8a01c
...
...
@@ -58,16 +58,10 @@ VABinauralClustering::getOutput()
};
std
::
map
<
int
,
VABinauralCluster
*>::
const_iterator
clusterIt
;
clusterIt
=
_curState
->
clusters
.
begin
();
ITASampleFrame
*
clusterOutput
=
clusterIt
->
second
->
getOutput
();
(
*
_output
)[
0
]
+=
(
*
clusterOutput
)[
0
];
(
*
_output
)[
1
]
+=
(
*
clusterOutput
)[
1
];
for
(
++
clusterIt
;
clusterIt
!=
_curState
->
clusters
.
end
();
++
clusterIt
)
for
(
clusterIt
=
_curState
->
clusters
.
begin
();
clusterIt
!=
_curState
->
clusters
.
end
();
++
clusterIt
)
{
clusterOutput
=
clusterIt
->
second
->
getOutput
();
ITASampleFrame
*
clusterOutput
=
clusterIt
->
second
->
getOutput
();
(
*
_output
)[
0
]
+=
(
*
clusterOutput
)[
0
];
(
*
_output
)[
1
]
+=
(
*
clusterOutput
)[
1
];
...
...
@@ -79,8 +73,8 @@ VABinauralClustering::getOutput()
void
VABinauralClustering
::
update
()
{
if
(
_nextState
==
nullptr
)
{
//
if (_nextState == nullptr)
//
{
VABinauralClusteringState
*
state
=
new
VABinauralClusteringState
(
_numClusters
,
_listener
,
clusterPool
);
//new VABinauralClusteringState(*_curState);
...
...
@@ -109,7 +103,9 @@ VABinauralClustering::update()
for
(
sourceIt
=
_unassignedSources
.
begin
();
sourceIt
!=
_unassignedSources
.
end
();
++
sourceIt
)
{
state
->
addSource
(
sourceIt
->
first
,
sourceIt
->
second
,
_threshold
,
0
);
if
(
sourceIt
->
second
->
hasValidTrajectory
){
state
->
addSource
(
sourceIt
->
first
,
sourceIt
->
second
,
_threshold
,
0
);
};
}
// TODO: refinement
...
...
@@ -123,7 +119,7 @@ VABinauralClustering::update()
//_unassignedSources.clear();
_nextState
.
reset
(
state
);
}
//
}
}
void
...
...
src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/VABinauralClusteringState.cpp
View file @
b9c8a01c
...
...
@@ -101,7 +101,7 @@ VABinauralClusteringState::removeSource(int sourceID)
std
::
pair
<
int
,
VABinauralCluster
*>
VABinauralClusteringState
::
createCluster
(
int
sourceID
,
VABinauralSoundSource
*
source
)
{
int
clusterID
=
freeClusterIDs
.
back
();
int
clusterID
=
freeClusterIDs
.
front
();
VABinauralCluster
*
cluster
=
dynamic_cast
<
VABinauralCluster
*
>
(
_clusterPool
->
RequestObject
());
// Reference = 1
cluster
->
init
(
sourceID
,
source
,
listener
);
...
...
src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource/VABinauralSoundSource.cpp
View file @
b9c8a01c
...
...
@@ -25,7 +25,9 @@ VABinauralSoundSource::PreRequest()
sourceMotionConf
.
iNumHistoryKeys
=
conf
.
motionModelNumHistoryKeys
;
motionModel
=
new
CVASharedMotionModel
(
new
CVABasicMotionModel
(
sourceMotionConf
),
true
);
state
=
nullptr
;
data
=
nullptr
;
hasValidTrajectory
=
false
;
}
void
...
...
src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource/VABinauralSoundSource.h
View file @
b9c8a01c
...
...
@@ -31,6 +31,7 @@ public:
bool
hasValidTrajectory
;
const
config_t
conf
;
CVASoundSourceState
*
state
;
CVASoundSourceDesc
*
data
;
CVASharedMotionModel
*
motionModel
;
CITAVariableDelayLine
*
vdlChL
;
...
...
src/Rendering/Binaural/RealTime/Utils/Config/VAConfig.cpp
View file @
b9c8a01c
#include "VAConfig.h"
int
VAConfig
::
blockLength
=
128
;
int
VAConfig
::
hrirLength
=
256
;
int
VAConfig
::
hrirLength
=
128
;
double
VAConfig
::
amplitudeCalibration
=
1.0
;
VAConfig
::
VAConfig
()
{}
VAConfig
::~
VAConfig
()
{}
...
...
src/Rendering/Binaural/RealTime/Utils/Config/VAConfig.h
View file @
b9c8a01c
...
...
@@ -6,6 +6,7 @@ class VAConfig
public:
static
int
blockLength
;
static
int
hrirLength
;
static
double
amplitudeCalibration
;
private:
VAConfig
();
~
VAConfig
();
...
...
src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.cpp
View file @
b9c8a01c
...
...
@@ -27,8 +27,7 @@ VABinauralRealTimeRenderer::VABinauralRealTimeRenderer( const CVAAudioRendererIn
_newSceneState
(
NULL
),
_curSceneState
(
NULL
),
_indicateReset
(
false
),
_resetAck
(
false
),
_clusterEngine
()
_resetAck
(
false
)
{
init
(
*
_params
.
pConfig
);
...
...
@@ -104,6 +103,10 @@ VABinauralRealTimeRenderer::init( const CVAStruct& oArgs )
VAConfig
::
blockLength
=
GetBlocklength
();
VAConfig
::
hrirLength
=
_hrirFilterLength
;
VAConfig
::
amplitudeCalibration
=
_core
->
GetCoreConfig
()
->
dDefaultAmplitudeCalibration
;
// initialize after config
_clusterEngine
=
new
VABinauralClusterEngine
();
}
void
...
...
@@ -150,7 +153,7 @@ VABinauralRealTimeRenderer::ProcessStream(const ITAStreamInfo* streamInfo)
updateTrajectories
(
time
);
// -- create output for every listener
for
(
auto
const
&
clusteringIt
:
_clusterEngine
.
_clusterings
)
for
(
auto
const
&
clusteringIt
:
_clusterEngine
->
_clusterings
)
{
VABinauralClustering
*
clustering
=
clusteringIt
.
second
;
...
...
@@ -186,6 +189,8 @@ VABinauralRealTimeRenderer::UpdateScene(CVASceneState* newSceneState)
// update sources
updateSources
(
&
diff
);
_clusterEngine
->
update
();
// Alte Szene freigeben (dereferenzieren)
if
(
_curSceneState
)
_curSceneState
->
RemoveReference
();
...
...
@@ -231,16 +236,35 @@ VABinauralRealTimeRenderer::updateSources( CVASceneStateDiff* diff )
CVASoundSourceState
*
sourceCur
=
(
_curSceneState
?
_curSceneState
->
GetSoundSourceState
(
sourceID
)
:
nullptr
);
CVASoundSourceState
*
sourceNew
=
(
_newSceneState
?
_newSceneState
->
GetSoundSourceState
(
sourceID
)
:
nullptr
);
if
(
sourceNew
&&
(
sourceNew
!=
sourceCur
))
{
source
->
state
=
sourceNew
;
}
const
CVAMotionState
*
motionCur
=
(
sourceCur
?
sourceCur
->
GetMotionState
()
:
nullptr
);
const
CVAMotionState
*
motionNew
=
(
sourceNew
?
sourceNew
->
GetMotionState
()
:
nullptr
);
if
(
motionNew
&&
(
motionNew
!=
motionCur
))
{
source
->
motionModel
->
InputMotionKey
(
motionNew
);
// Dirty Hack
if
(
!
source
->
hasValidTrajectory
)
{
VAVec3
pos
=
motionNew
->
GetPosition
();
if
(
pos
!=
VAVec3
(
0
,
0
,
0
))
{
VAVec3
view
=
motionNew
->
GetView
();
VAVec3
up
=
motionNew
->
GetUp
();
source
->
predPos
=
pos
;
source
->
predView
=
view
;
source
->
predUp
=
up
;
source
->
hasValidTrajectory
=
true
;
}
}
}
}
_clusterEngine
.
update
();
}
void
...
...
@@ -284,8 +308,6 @@ VABinauralRealTimeRenderer::updateListeners( CVASceneStateDiff* diff )
listener
->
directivity
=
(
IVADirectivity
*
)
listenerNew
->
GetDirectivity
();
}
}
_clusterEngine
.
update
();
}
void
...
...
@@ -293,6 +315,8 @@ VABinauralRealTimeRenderer::createSource( const int sourceID, const CVASoundSour
{
VABinauralSoundSource
*
source
=
dynamic_cast
<
VABinauralSoundSource
*
>
(
_sourcePool
->
RequestObject
());
// Reference = 1
// set state
source
->
state
=
(
CVASoundSourceState
*
)
sourceState
;
// set internal data
source
->
data
=
_core
->
GetSceneManager
()
->
GetSoundSourceDesc
(
sourceID
);
source
->
data
->
AddReference
();
...
...
@@ -306,7 +330,7 @@ VABinauralRealTimeRenderer::createSource( const int sourceID, const CVASoundSour
_sources
.
insert
(
std
::
pair
<
int
,
VABinauralSoundSource
*
>
(
sourceID
,
source
));
// add source to clustering
_clusterEngine
.
addSource
(
sourceID
,
source
);
_clusterEngine
->
addSource
(
sourceID
,
source
);
}
void
...
...
@@ -318,7 +342,7 @@ VABinauralRealTimeRenderer::deleteSource(int sourceID)
_sources
.
erase
(
it
);
// remove listener reference from clustering
_clusterEngine
.
removeSource
(
sourceID
);
_clusterEngine
->
removeSource
(
sourceID
);
source
->
RemoveReference
();
}
...
...
@@ -344,7 +368,7 @@ VABinauralRealTimeRenderer::createListener(int listenerID, const CVAReceiverStat
// add listener to clustering
VABinauralClusterEngine
::
clusterConfig_t
config
=
{
/*numClusters=*/
9
};
_clusterEngine
.
addListener
(
listenerID
,
listener
,
config
);
_clusterEngine
->
addListener
(
listenerID
,
listener
,
config
);
}
void
...
...
@@ -360,7 +384,7 @@ VABinauralRealTimeRenderer::deleteListener(int listenerID)
listener
->
RemoveReference
();
// remove listener reference from clustering
_clusterEngine
.
removeListener
(
listenerID
);
_clusterEngine
->
removeListener
(
listenerID
);
}
void
VABinauralRealTimeRenderer
::
updateMotionStates
()
...
...
src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.h
View file @
b9c8a01c
...
...
@@ -49,7 +49,7 @@ private:
std
::
map
<
int
,
VABinauralSoundSource
*
>
_sources
;
std
::
map
<
int
,
VABinauralListener
*
>
_listeners
;
VABinauralClusterEngine
_clusterEngine
;
VABinauralClusterEngine
*
_clusterEngine
;
CVACoreImpl
*
_core
;
...
...
Write
Preview
Markdown
is supported
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