From 96f5a55c672cdea2047cb93816827d6c72ba8d06 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Tue, 19 Jun 2018 22:18:46 +0200 Subject: RendererDRMPRIME: support NUM_BUFFERS video buffers --- .../VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.cpp | 6 ++---- .../cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.cpp index 7b2417bf3d..2106522e72 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.cpp @@ -96,7 +96,7 @@ void CRendererDRMPRIME::AddVideoPicture(const VideoPicture& picture, int index, void CRendererDRMPRIME::Reset() { - for (int i = 0; i < m_numRenderBuffers; i++) + for (int i = 0; i < NUM_BUFFERS; i++) ReleaseBuffer(i); m_iLastRenderBuffer = -1; @@ -125,9 +125,7 @@ bool CRendererDRMPRIME::NeedBuffer(int index) CRenderInfo CRendererDRMPRIME::GetRenderInfo() { CRenderInfo info; - info.max_buffer_size = m_numRenderBuffers; - info.optimal_buffer_size = m_numRenderBuffers; - info.opaque_pointer = (void*)this; + info.max_buffer_size = NUM_BUFFERS; return info; } diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.h index ecc4547380..6bf58e76b3 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.h +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.h @@ -61,13 +61,11 @@ private: bool m_bConfigured = false; int m_iLastRenderBuffer = -1; - static const int m_numRenderBuffers = 4; std::shared_ptr m_DRM; struct BUFFER { - BUFFER() : videoBuffer(nullptr) {}; - CVideoBuffer* videoBuffer; - } m_buffers[m_numRenderBuffers]; + CVideoBuffer* videoBuffer = nullptr; + } m_buffers[NUM_BUFFERS]; }; -- cgit v1.2.3