Improve logging

mdias · Jan 12, 2020 · 4c12f75 · 4c12f75
1 parent d9ce598
commit 4c12f75
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/RS_ASIO/AsioSharedHost.cpp b/RS_ASIO/AsioSharedHost.cpp
@@ -567,6 +567,11 @@ const ASIOChannelInfo* AsioSharedHost::GetInputChannelInfo(unsigned channel) con
 	return &m_AsioInChannelInfo[channel];
 }
 
+void AsioSharedHost::ResetDebugLogAsioBufferSwitches()
+{
+	m_dbgNumBufferSwitches = 0;
+}
+
 void AsioSharedHost::DisplayCurrentError() const
 {
 	if (!m_Driver)

diff --git a/RS_ASIO/AsioSharedHost.h b/RS_ASIO/AsioSharedHost.h
@@ -42,6 +42,8 @@ class AsioSharedHost : public ComBaseUnknown<IUnknown>
 	unsigned GetNumInputChannels() const { return m_AsioInChannelInfo.size(); }
 	unsigned GetNumOutputChannels() const { return m_AsioOutChannelInfo.size(); }
 
+	void ResetDebugLogAsioBufferSwitches();
+
 private:
 	void DisplayCurrentError() const;
 

diff --git a/RS_ASIO/DebugWrapperCaptureClient.cpp b/RS_ASIO/DebugWrapperCaptureClient.cpp
@@ -21,7 +21,6 @@ HRESULT STDMETHODCALLTYPE DebugWrapperCaptureClient::GetBuffer(BYTE **ppData, UI
 
 	if (m_GetCount < 3)
 	{
-		++m_GetCount;
 		rslog::info_ts() << m_DeviceId << " " __FUNCTION__  << std::endl;
 
 		hr = m_RealClient.GetBuffer(ppData, pNumFramesToRead, pdwFlags, pu64DevicePosition, pu64QPCPosition);
@@ -45,6 +44,7 @@ HRESULT STDMETHODCALLTYPE DebugWrapperCaptureClient::ReleaseBuffer(UINT32 NumFra
 
 	if (m_GetCount < 3)
 	{
+		++m_GetCount;
 		rslog::info_ts() << m_DeviceId << " " __FUNCTION__ " NumFramesRead: " << NumFramesRead << std::endl;
 		hr = m_RealClient.ReleaseBuffer(NumFramesRead);
 	}

diff --git a/RS_ASIO/DebugWrapperRenderClient.cpp b/RS_ASIO/DebugWrapperRenderClient.cpp
@@ -21,7 +21,6 @@ HRESULT STDMETHODCALLTYPE DebugWrapperRenderClient::GetBuffer(UINT32 NumFramesRe
 
 	if (m_GetCount < 3)
 	{
-		++m_GetCount;
 		rslog::info_ts() << m_DeviceId << " " __FUNCTION__ " NumFramesRequested: " << NumFramesRequested << std::endl;
 
 		hr = m_RealClient.GetBuffer(NumFramesRequested, ppData);
@@ -45,6 +44,7 @@ HRESULT STDMETHODCALLTYPE DebugWrapperRenderClient::ReleaseBuffer(UINT32 NumFram
 
 	if (m_GetCount < 3)
 	{
+		++m_GetCount;
 		rslog::info_ts() << m_DeviceId << " " __FUNCTION__ " NumFramesWritten: " << NumFramesWritten << std::endl;
 		hr = m_RealClient.ReleaseBuffer(NumFramesWritten, dwFlags);
 	}

diff --git a/RS_ASIO/RSAsioAudioClient.cpp b/RS_ASIO/RSAsioAudioClient.cpp
@@ -310,6 +310,7 @@ HRESULT RSAsioAudioClient::Start()
 		return AUDCLNT_E_NOT_STOPPED;
 
 	m_IsStarted = true;
+	m_dbgNumBufferSwitches = 0;
 
 	return S_OK;
 }
@@ -435,6 +436,9 @@ void RSAsioAudioClient::SwapBuffers()
 	std::lock_guard<std::mutex> g(m_bufferMutex);
 	std::swap(m_frontBuffer, m_backBuffer);
 	m_bufferHasUpdatedData = true;
+
+	if (m_dbgNumBufferSwitches < 3)
+		rslog::info_ts() << m_AsioDevice.GetIdRef() << " " __FUNCTION__ << std::endl;
 }
 
 void RSAsioAudioClient::OnAsioBufferSwitch(unsigned buffIdx)
@@ -452,6 +456,8 @@ void RSAsioAudioClient::OnAsioBufferSwitch(unsigned buffIdx)
 	else if (!m_bufferHasUpdatedData)
 	{
 		rslog::info_ts() << m_AsioDevice.GetIdRef() << " " __FUNCTION__ " - buffer underrun detected" << std::endl;
+		m_AsioDevice.GetAsioHost().ResetDebugLogAsioBufferSwitches();
+		m_dbgNumBufferSwitches = 0;
 	}
 
 	// sanity check
@@ -553,11 +559,19 @@ void RSAsioAudioClient::OnAsioBufferSwitch(unsigned buffIdx)
 		}
 	}
 
-	if (m_UsingEventHandle && m_EventHandle && m_bufferHasUpdatedData)
+	const bool signalEvent = (m_UsingEventHandle && m_EventHandle && m_bufferHasUpdatedData);
+	if (signalEvent)
 	{
 		SetEvent(m_EventHandle);
 	}
 	m_bufferHasUpdatedData = false;
+
+	if (m_IsStarted && m_dbgNumBufferSwitches < 3)
+	{
+		++m_dbgNumBufferSwitches;
+		if (m_dbgNumBufferSwitches < 3)
+			rslog::info_ts() << m_AsioDevice.GetIdRef() << " " __FUNCTION__ " - signalled event: " << signalEvent << std::endl;
+	}
 }
 
 void RSAsioAudioClient::UpdateChannelMap()

diff --git a/RS_ASIO/RSAsioAudioClient.h b/RS_ASIO/RSAsioAudioClient.h
@@ -72,6 +72,8 @@ class RSAsioAudioClient : public ComBaseUnknown<IAudioClient3>, protected IAsioB
 	std::vector<BYTE> m_backBuffer;
 	bool m_bufferHasUpdatedData = false;
 
+	unsigned m_dbgNumBufferSwitches;
+
 	std::mutex m_bufferMutex;
 	DWORD m_bufferNumFrames;
 	std::vector<int> m_ChannelMap;