diff options
author | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-04-18 09:47:08 -0600 |
---|---|---|
committer | Trent Nelson <trent.nelson@pivosgroup.com> | 2014-04-18 10:31:06 -0600 |
commit | dc89c8e8ca638ba6ada83d643292dcac70e7b329 (patch) | |
tree | aaf46be49c350af6e8f83fca0842b794a8022aa5 | |
parent | 4540f8092d82a25b021c162726cc0731afa7b2de (diff) |
Merge pull request #4574 from FernetMenta/aefixes
ActiveAE: recreate sink buffers if frame size has changed
-rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp index 3b7dbe1ad3..e2b3d28460 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -1169,7 +1169,9 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt) // resample buffers for sink if (m_sinkBuffers && - (!CompareFormat(m_sinkBuffers->m_format,m_sinkFormat) || !CompareFormat(m_sinkBuffers->m_inputFormat, sinkInputFormat))) + (!CompareFormat(m_sinkBuffers->m_format,m_sinkFormat) || + !CompareFormat(m_sinkBuffers->m_inputFormat, sinkInputFormat) || + m_sinkBuffers->m_format.m_frames != m_sinkFormat.m_frames)) { m_discardBufferPools.push_back(m_sinkBuffers); m_sinkBuffers = NULL; |