correction factor für die schätzung des servers

include/ITANetAudioStreamingServer.h

@@ -104,6 +104,7 @@ private:
 
 	int m_iServerBlockId;
 	double m_dLastTimeStamp;
+	double m_dEstimatedCorrFactor;
 
 	int m_iTargetLatencySamples;
 	int m_iEstimatedClientRingBufferFreeSamples;

src/ITANetAudioStreamingServer.cpp

@@ -31,6 +31,7 @@ struct CITAServerLog : public ITALogDataBase
 		os << "\t" << "ProtocolStatus";
 		os << "\t" << "EstimatedFreeSamples";
 		os << "\t" << "TransmittedSamples";
+		os << "\t" << "EstimatedCorrFactor";
 		os << std::endl;
 		return os;
 	};
@@ -42,6 +43,7 @@ struct CITAServerLog : public ITALogDataBase
 		os << "\t" << sProtocolStatus;
 		os << "\t" << iEstimatedFreeSamples;
 		os << "\t" << iTransmittedSamples;
+		os << "\t" << dEstimatedCorrFactor;
 		os << std::endl;
 		return os;
 	};
@@ -51,6 +53,7 @@ struct CITAServerLog : public ITALogDataBase
 	std::string sProtocolStatus;
 	int iEstimatedFreeSamples;
 	int iTransmittedSamples;
+	double dEstimatedCorrFactor;
 };
 
 class CITABufferedDataLoggerImplServer : public ITABufferedDataLogger < CITAServerLog > {};
@@ -67,6 +70,7 @@ CITANetAudioStreamingServer::CITANetAudioStreamingServer()
 	, m_iServerBlockId( 0 )
 	, m_iEstimatedClientRingBufferFreeSamples( 0 )
 	, m_iClientRingBufferSize( 0 )
+	, m_dEstimatedCorrFactor( 1 )
 {
 	// Careful with this:
 	//SetPriority( VistaPriority::VISTA_MID_PRIORITY );
@@ -214,7 +218,11 @@ bool CITANetAudioStreamingServer::LoopBody()
 		{
 		case CITANetAudioProtocol::NP_CLIENT_SENDING_RINGBUFFER_FREE_SAMPLES:
 		{
+			int iOldEstimatedRingBufferFreeSamples = m_iEstimatedClientRingBufferFreeSamples;
 			m_iEstimatedClientRingBufferFreeSamples = m_pMessage->ReadInt();
+			double dEstimatedDiffSamples = (dNow - m_dLastTimeStamp) * 44100;
+			double dRealDiffSamples = m_iEstimatedClientRingBufferFreeSamples - iOldEstimatedRingBufferFreeSamples;
+			m_dEstimatedCorrFactor = dRealDiffSamples / dEstimatedDiffSamples;
 			m_dLastTimeStamp = dNow;
 			break;
 		}
@@ -246,7 +254,7 @@ bool CITANetAudioStreamingServer::LoopBody()
 		// There is no status message, so we estimate the client-side ring buffer status
 		const double dTimeDiff = dNow - m_dLastTimeStamp;
 		m_dLastTimeStamp = dNow;
-		double dEstimatedSamples = dTimeDiff * m_pInputStream->GetSampleRate();
+		double dEstimatedSamples = m_dEstimatedCorrFactor * dTimeDiff * m_pInputStream->GetSampleRate();
 		m_iEstimatedClientRingBufferFreeSamples += ( int ) dEstimatedSamples;
 		oLog.sProtocolStatus = "SERVER_ESTIMATION";
 	}
@@ -254,6 +262,7 @@ bool CITANetAudioStreamingServer::LoopBody()
 		m_swTryReadBlockStats.stop();
 
 	oLog.iEstimatedFreeSamples = m_iEstimatedClientRingBufferFreeSamples;
+	oLog.dEstimatedCorrFactor = m_dEstimatedCorrFactor;
 	m_pServerLogger->log( oLog );
 
 	return false;

tests/NetAudio/ITANetAudioTest.cpp

@@ -24,7 +24,7 @@ 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 = 128;
-const static int g_iChannels = 100;
+const static int g_iChannels = 10;
 const static int g_iTargetLatencySamples = g_iBlockLength * 10;
 const static int g_iRingerBufferCapacity = g_iBlockLength * 20;
 const static double g_dDuration = 10.0f;