From eb6565077ea7cfe2dbcc71ed44be9cc6433ed2d9 Mon Sep 17 00:00:00 2001
From: Anne Heimes <anne.heimes@rwth-aachen.de>
Date: Mon, 3 Apr 2017 10:29:19 +0200
Subject: [PATCH] estimated corr factor selbst stezten, jetzt messen wie es
aussieht
---
include/ITANetAudioStreamingServer.h | 7 +++++--
src/ITANetAudioStreamingServer.cpp | 16 ++++++++++++----
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/include/ITANetAudioStreamingServer.h b/include/ITANetAudioStreamingServer.h
index 78199f6..5f14aee 100644
--- a/include/ITANetAudioStreamingServer.h
+++ b/include/ITANetAudioStreamingServer.h
@@ -65,8 +65,11 @@ public:
void SetInputStream( ITADatasource* pInStream );
int GetNetStreamBlocklength() const;
- int GetNetStreamNumberOfChannels() const;
- double GetNetStreamSampleRate() const;
+ int GetNetStreamNumberOfChannels( ) const;
+ double GetNetStreamSampleRate( ) const;
+
+ double GetEstimatedCorrFactor( ) const;
+ void SetEstimatedCorrFactor( double dcorrFactor );
//! Enabled/disables export of loggers
diff --git a/src/ITANetAudioStreamingServer.cpp b/src/ITANetAudioStreamingServer.cpp
index b90c158..37aeb32 100644
--- a/src/ITANetAudioStreamingServer.cpp
+++ b/src/ITANetAudioStreamingServer.cpp
@@ -218,11 +218,7 @@ 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;
}
@@ -353,6 +349,18 @@ int CITANetAudioStreamingServer::GetNetworkPort() const
return m_pNetAudioServer->GetNetworkPort();
}
+double CITANetAudioStreamingServer::GetEstimatedCorrFactor( ) const
+{
+ return m_dEstimatedCorrFactor;
+}
+
+void CITANetAudioStreamingServer::SetEstimatedCorrFactor( double dCorrFactor )
+{
+ m_dEstimatedCorrFactor = dCorrFactor;
+}
+
+
+
void CITANetAudioStreamingServer::Stop()
{
m_pNetAudioServer->Stop();
--
GitLab