From 33bf6f011f725fde0c1db51e6922bb3e2b11e4d3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 19 Jan 2018 17:33:41 +0000 Subject: [PATCH] hack: Don't assert when unexpected buffer id but keep going --- .../VideoRenderers/HwDecRender/MMALRenderer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp index 75b4b535661ee..4734394521597 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp @@ -867,7 +867,12 @@ void CMMALRenderer::AddVideoPicture(const VideoPicture& pic, int id, double curr if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) CLog::Log(LOGDEBUG, "%s::%s MMAL - %p (%p) %i", CLASSNAME, __func__, buffer, buffer->mmal_buffer, id); - assert(!m_buffers[id]); + //assert(!m_buffers[id]); + if (m_buffers[id]) + { + CLog::Log(LOGNOTICE, "%s::%s MMAL - Unexpected m_buffers[%i]:%p buffer:%p (%p)", CLASSNAME, __func__, id, m_buffers[id], buffer, buffer->mmal_buffer); + m_buffers[id]->Release(); + } buffer->Acquire(); m_buffers[id] = buffer; UpdateFramerateStats(pic.pts);