Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Institute of Technical Acoustics (ITA)
ITADataSources
Commits
ed170e0f
Commit
ed170e0f
authored
Mar 28, 2017
by
Anne Heimes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ba_2016_heimes' of
https://git.rwth-aachen.de/ita/ITADataSources
into ba_2016_heimes
parents
90a01fef
e7d71ecd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
10 deletions
+14
-10
src/ITANetAudioStreamingClient.cpp
src/ITANetAudioStreamingClient.cpp
+1
-1
src/ITANetAudioStreamingServer.cpp
src/ITANetAudioStreamingServer.cpp
+1
-1
tests/NetAudio/ITANetAudioTest.cpp
tests/NetAudio/ITANetAudioTest.cpp
+7
-5
tests/NetAudio/NetAudioLog.m
tests/NetAudio/NetAudioLog.m
+5
-3
No files found.
src/ITANetAudioStreamingClient.cpp
View file @
ed170e0f
...
...
@@ -69,7 +69,7 @@ CITANetAudioStreamingClient::CITANetAudioStreamingClient( CITANetAudioStream* pP
m_pClientLogger
=
new
ITABufferedDataLoggerImplClient
();
SetClientLoggerBaseName
(
"ITANetAudioStreamingClient"
);
VistaThread
::
SetPriority
(
VistaPriority
::
VISTA_MID_PRIORITY
);
//
SetPriority( VistaPriority::VISTA_MID_PRIORITY );
}
CITANetAudioStreamingClient
::~
CITANetAudioStreamingClient
()
...
...
src/ITANetAudioStreamingServer.cpp
View file @
ed170e0f
...
...
@@ -69,7 +69,7 @@ CITANetAudioStreamingServer::CITANetAudioStreamingServer()
m_iMaxSendBlocks
=
40
;
m_iEstimatedClientRingBufferFreeSamples
=
0
;
VistaThread
::
SetPriority
(
VistaPriority
::
VISTA_MID_PRIORITY
);
//
SetPriority( VistaPriority::VISTA_MID_PRIORITY );
}
CITANetAudioStreamingServer
::~
CITANetAudioStreamingServer
()
...
...
tests/NetAudio/ITANetAudioTest.cpp
View file @
ed170e0f
...
...
@@ -24,13 +24,15 @@ const static string g_sServerName = "localhost";
const
static
string
g_sInputFilePath
=
"gershwin-mono.wav"
;
const
static
int
g_iServerPort
=
12480
;
const
static
double
g_dSampleRate
=
44100
;
const
static
int
g_iBlockLength
=
512
;
const
static
int
g_iBlockLength
=
256
;
const
static
int
g_iChannels
=
2
;
const
static
int
g_iTargetLatencySamples
=
g_iBlockLength
*
3
;
const
static
int
g_iRingerBufferCapacity
=
g_iBlockLength
*
4
;
const
static
int
g_iTargetLatencySamples
=
g_iBlockLength
*
1
;
const
static
int
g_iRingerBufferCapacity
=
g_iBlockLength
*
5
;
const
static
double
g_dDuration
=
10.0
f
;
const
static
double
g_dSyncTimout
=
0.001
f
;
const
static
bool
g_bUseASIO
=
true
;
const
static
string
g_sAudioInterface
=
"ASIO4ALL v2"
;
//const static string g_sAudioInterface = "ASIO4ALL v2";
const
static
string
g_sAudioInterface
=
"ASIO Hammerfall DSP"
;
class
CServer
:
public
VistaThread
{
...
...
@@ -62,7 +64,7 @@ public:
void
ThreadBody
(
)
{
vstr
::
out
()
<<
"[ NetAudioTestServer ] Starting net audio server and waiting for client connections on '"
<<
g_sServerName
<<
"' on port "
<<
g_iServerPort
<<
endl
;
pStreamingServer
->
Start
(
g_sServerName
,
g_iServerPort
,
0.1
);
pStreamingServer
->
Start
(
g_sServerName
,
g_iServerPort
,
g_dSyncTimout
);
};
private:
...
...
tests/NetAudio/NetAudioLog.m
View file @
ed170e0f
...
...
@@ -6,9 +6,9 @@ ITANetAudioTest_Client_NetworkStream = readtable( 'ITANetAudioTest_Client_Networ
%% Settings
B
=
512
;
TL
=
B
*
3
;
RB
=
B
*
4
;
B
=
265
;
TL
=
B
*
1
;
RB
=
B
*
5
;
%% Analyse
...
...
@@ -27,7 +27,9 @@ ClientAudioStreamTiming = diff( ITANetAudioTest_Client_AudioStream.WorldTimeStam
ClientNetStreamTiming
=
diff
(
ITANetAudioTest_Client_NetworkStream
.
WorldTimeStamp
);
%% Plot
figure
subplot
(
2
,
1
,
1
)
% Client
plot
(
ITANetAudioTest_Client
.
WorldTimeStamp
-
TS
,
RB
-
ITANetAudioTest_Client
.
FreeSamples
,
'LineWidth'
,
1
)
hold
on
...
...
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