Commit 6142d178 authored by Michael Kohnen's avatar Michael Kohnen
Browse files

Basic development

parent 0b3668e9
......@@ -66,3 +66,4 @@ OrientationYPR = -45, -19.1, 0
#DataFileName = $(VADataDir)/LSEQ/KleinHummel/ls16_eq_nDFT_1025.daff
......@@ -5,9 +5,14 @@
[Output:VRLAB_LS_ALL]
Description = ITA VRLab setup using all available broadband loudspeaker (O300 & O110)
Enabled = true
Enabled = false
Devices = LS_FL, LS_FR, LS_RL, LS_RR, LS_TF, LS_TR, LS_TB, LS_TL, LS_BF, LS_BR, LS_BB, LS_BL
[Output:VRLAB_VLS_ALL]
Description = ITA VRLab setup using all available broadband loudspeaker (O300 & O110)
Enabled = false
Devices = LS_FL, LS_FR, LS_RL, LS_RR, LS_TF, LS_TR, LS_TB, LS_TL, LS_BF, LS_BR, LS_BB, LS_BL, LS_VU, LS_VD
[Output:VRLAB_LS_HORIZONTAL]
Description = ITA VRLab setup using loudspeaker ring in horizontal plane at user's head elevation
Enabled = true
......@@ -178,3 +183,21 @@ Channels = 21, 22
Type = HP
Description = Sennheiser wirless headphones
Channels = 23, 24
[OutputDevice:LS_VU]
Type = LS
Description = K&H O110D, no16, rear-left
Channels = 15
#Position = 0.0, 2.0, 0.0
#OrientationYPR = -45, -15, 0
Position = 0, 2, 0
OrientationYPR = -45, -19.1, 0
#DataFileName = $(VADataDir)/LSEQ/KleinHummel/ls16_eq_nDFT_1025.daff
[OutputDevice:LS_VD]
Type = LS
Description = K&H O110D, no16, rear-left
Channels = 16
Position = 0.0, -2.0, 0.0
OrientationYPR = -45, -19.1, 0
#DataFileName = $(VADataDir)/LSEQ/KleinHummel/ls16_eq_nDFT_1025.daff
\ No newline at end of file
......@@ -235,6 +235,7 @@ CVAAmbisonicsFreeFieldAudioRenderer::CVAAmbisonicsFreeFieldAudioRenderer(const C
, m_dAdditionalStaticDelaySeconds(0.0f)
, m_oParams(oParams)
, m_iMaxOrder(-1)
, m_iNumChannels(-1)
{
// read config
Init(*oParams.pConfig);
......@@ -613,12 +614,12 @@ void CVAAmbisonicsFreeFieldAudioRenderer::ProcessStream(const ITAStreamInfo* pSt
SyncInternalData();
std::vector<float*> pfOutputCh;
for (int i = 0; i < m_iNumChannels; i++)
{
float* helper = GetWritePointer(i);
fm_zero(helper, GetBlocklength());
pfOutputCh.push_back(helper);
}
//for (int i = 0; i < m_iNumChannels; i++)
//{
// float* helper = GetWritePointer(i);
// fm_zero(helper, GetBlocklength());
// pfOutputCh.push_back(helper);
//}
......
......@@ -48,7 +48,7 @@ CVAAmbisonicsBinauralMixdownReproduction::CVAAmbisonicsBinauralMixdownReproducti
{
CVAConfigInterpreter conf( *(m_oParams.pConfig) );
conf.ReqInteger( "AmbisonicsTruncationOrder", m_iAmbisonicsTruncationOrder );
conf.ReqInteger( "AmbisonicsTruncationOrder", m_iAmbisonicsTruncationOrder ); // Sollte aus der Zahl der Eingangskanle berechnet werden
conf.OptInteger( "HRIRFilterLength", m_iHRIRFilterLength, 128 );
conf.OptInteger( "TrackedListenerID", m_iListenerID, 1 );
......@@ -84,17 +84,17 @@ CVAAmbisonicsBinauralMixdownReproduction::CVAAmbisonicsBinauralMixdownReproducti
m_pdsStreamFilter = new CMixdownStreamFilter( GetNumVirtualLoudspeaker(), dSampleRate, iBlockLength, m_iHRIRFilterLength );
m_pdsStreamFilter->pdsInput = m_pDecoderMatrixPatchBay->GetOutputDatasource( 0 );
double dYInv[9][12] =
double dYInv[9][14] =
{
{ -1.2641, -1.2641, -1.2641, -1.2641, 1.0191, 1.0191, 1.0191 , 1.0191 , 1.1312 , 1.1312 , 1.1312 , 1.1312 },
{ 0.2659 , -0.2659 , -0.2659 , 0.2659 , -0.0000 , -0.3333 , 0.0000 , 0.3333 , -0.0000 , -0.3638 , 0.0000 , 0.3638 },
{ 0.1441 , 0.1441 , 0.1441 , 0.1441 , 0.6210 , 0.6210 , 0.6210 , 0.6210 , -0.7651 , -0.7651 , -0.7651 , -0.7651 },
{ 0.2659 , 0.2659 , -0.2659 , -0.2659 , 0.3333 , 0.0000 , -0.3333 , 0.0000 , 0.3638 , -0.0000 , -0.3638 , 0.0000 },
{ -0.4576, 0.4576, -0.4576, 0.4576, 0.0000, -0.0000, -0.0000 , -0.0000 , 0.0000 , 0.0000 , -0.0000 , -0.0000 },
{ -0.0113, 0.0113, 0.0113, -0.0113, 0.0000, -0.6780, -0.0000 , 0.6780 , 0.0000 , 0.6496 , -0.0000 , -0.6496 },
{ -1.9233, -1.9233, -1.9233, -1.9233, 0.9115, 0.9115, 0.9115 , 0.9115 , 1.0118 , 1.0118 , 1.0118 , 1.0118 },
{ -0.0113, -0.0113, 0.0113, 0.0113, 0.6780, 0.0000, -0.6780 , 0.0000 , -0.6496 , 0.0000 , 0.6496 , -0.0000 },
{ 0.0000 , 0.0000 , 0.0000 , -0.0000 , 0.2610 , -0.2610 , 0.2610 ,-0.2610 , 0.2698 , -0.2698 , 0.2698 , -0.2698 },
{ 0.1935, 0.1935, 0.1935, 0.1935, 0.2287, 0.2287, 0.2287, 0.2287, 0.2323, 0.2323, 0.2323, 0.2323, 0.4788, 0.4484 },
{ -0.0043, -0.0043, -0.0043, -0.0043, 0.2512, 0.2512, 0.2512, 0.2512, -0.2380, -0.2380, -0.2380, -0.2380, -0.6773, 0.6419 },
{ -0.2659, -0.2659, 0.2659, 0.2659, -0.3333, 0.0000, 0.3333, -0.0000, -0.3638, -0.0000, 0.3638, 0.0000, 0.0000, 0.0000 },
{ -0.2659, 0.2659, 0.2659, -0.2659, 0.0000, 0.3333, -0.0000, -0.3333, -0.0000, 0.3638, 0.0000, -0.3638, -0.0000, 0.0000 },
{ 0.0113, -0.0113, -0.0113, 0.0113, 0.0000, 0.6780, 0.0000, -0.6780, 0.0000, -0.6496, -0.0000, 0.6496, 0.0000, -0.0000 },
{ 0.0113, 0.0113, -0.0113, -0.0113, -0.6780, 0.0000, 0.6780, -0.0000, 0.6496, -0.0000, -0.6496, -0.0000, -0.0000, -0.0000 },
{ 0.0799, 0.0799, 0.0799, 0.0799, 0.2523, -0.1997, 0.2523, -0.1997, 0.2678, -0.1996, 0.2678, -0.1996, -0.2841, -0.2772 },
{ 0.4576, -0.4576, 0.4576, -0.4576, 0.0000, 0.0000, -0.0000, -0.0000, 0.0000, -0.0000, 0.0000, 0.0000, -0.0000, -0.0000 },
{ 0.1385, 0.1385, 0.1385, 0.1385, -0.0849, 0.1761, -0.0849, 0.1761, -0.0759, 0.1940, -0.0759, 0.1940, -0.4921, -0.4802 },
};
// Matrix
......
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