Commit ecbe89dd authored by Anne Heimes's avatar Anne Heimes
Browse files

add serverCorrection factor

parent c2ba8c23
...@@ -21,13 +21,14 @@ int g_iTargetLatencySamples = 10 * g_iBlockLength; // 1.4512ms ...@@ -21,13 +21,14 @@ int g_iTargetLatencySamples = 10 * g_iBlockLength; // 1.4512ms
int g_iRingBufferSize = 2 * g_iTargetLatencySamples; int g_iRingBufferSize = 2 * g_iTargetLatencySamples;
int g_iSendingBlockLength = 8; int g_iSendingBlockLength = 8;
double g_dClientStatusMessageTimeout = 0.001; // seconds double g_dClientStatusMessageTimeout = 0.001; // seconds
double g_dEstimatiedCorrFactor = 1;
string g_sFileName = "gershwin-mono.wav"; string g_sFileName = "gershwin-mono.wav";
bool g_bDebuggingEnabled = true; bool g_bDebuggingEnabled = true;
int main( int argc, char** argv ) int main( int argc, char** argv )
{ {
if ( argc >= 8 ) if ( argc >= 9 )
{ {
g_sServerName = argv[ 1 ]; g_sServerName = argv[ 1 ];
...@@ -41,10 +42,12 @@ int main( int argc, char** argv ) ...@@ -41,10 +42,12 @@ int main( int argc, char** argv )
g_iRingBufferSize = atoi(argv[7]); g_iRingBufferSize = atoi(argv[7]);
g_iSendingBlockLength = atoi(argv[8]); g_iSendingBlockLength = atoi(argv[8]);
} }
if (argc >= 9)
g_dEstimatiedCorrFactor = atoi(argv[9]);
} }
else else
{ {
cout << "Syntax: ServerName ServerPort SampleRate BufferSize Channel TargetLatencySamples RingBufferSize SnedingBlockLength" << endl; cout << "Syntax: ServerName ServerPort SampleRate BufferSize Channel TargetLatencySamples RingBufferSize SnedingBlockLength EstimatiedCorrFactor" << endl;
cout << "Using default values ..." << endl; cout << "Using default values ..." << endl;
} }
...@@ -72,9 +75,10 @@ int main( int argc, char** argv ) ...@@ -72,9 +75,10 @@ int main( int argc, char** argv )
ss << "_TL" << g_iTargetLatencySamples; ss << "_TL" << g_iTargetLatencySamples;
ss << "_RB" << g_iRingBufferSize; ss << "_RB" << g_iRingBufferSize;
ss << "_SB" << g_iSendingBlockLength; ss << "_SB" << g_iSendingBlockLength;
ss << "_EC" << g_dEstimatiedCorrFactor;
oStreamingServer.SetServerLogBaseName( ss.str() ); oStreamingServer.SetServerLogBaseName( ss.str() );
oStreamingServer.SetDebuggingEnabled( g_bDebuggingEnabled ); oStreamingServer.SetDebuggingEnabled( g_bDebuggingEnabled );
oStreamingServer.SetEstimatedCorrFactor( g_dEstimatiedCorrFactor );
oStreamingServer.SetInputStream( &oMuliplier ); oStreamingServer.SetInputStream( &oMuliplier );
oStreamingServer.SetTargetLatencySamples( g_iTargetLatencySamples ); oStreamingServer.SetTargetLatencySamples( g_iTargetLatencySamples );
oStreamingServer.SetSendingBlockLength( g_iSendingBlockLength ); oStreamingServer.SetSendingBlockLength( g_iSendingBlockLength );
......
Markdown is supported
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