From f57cd9abca1d8ae1938194344661201f496731ff Mon Sep 17 00:00:00 2001 From: jmarshallnz Date: Thu, 1 May 2014 18:59:18 +1200 Subject: [PATCH] Merge pull request #4619 from fritsch/aefixes ActiveAE: correct time of buffered samples by resample ratio --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 2 +- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp index ca156c8..8013d71 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -102,7 +102,7 @@ float CEngineStats::GetDelay(CActiveAEStream *stream) if (delay < 0) delay = 0.0; - delay += stream->m_bufferedTime; + delay += stream->m_bufferedTime / stream->m_streamResampleRatio; return delay; } diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp index 99989b3..0287e73 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp @@ -58,6 +58,7 @@ CActiveAEStream::CActiveAEStream(AEAudioFormat *format) m_forceResampler = false; m_remapper = NULL; m_remapBuffer = NULL; + m_streamResampleRatio = 1.0; } CActiveAEStream::~CActiveAEStream() -- 2.7.4