Merge pull request #9975 from popcornmix/mmallazy

 mmal_renderer: Use shared pointers to maintain the pool until the decoder has been destroyed

xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp

@@ -885,7 +885,10 @@ void CMMALVideo::Prime()
 {
   MMAL_BUFFER_HEADER_T *buffer;
   assert(m_renderer);
-  MMAL_POOL_T *render_pool = m_renderer->GetPool(RENDER_FMT_MMAL, AV_PIX_FMT_YUV420P, true);
+  if (!m_pool)
+    m_pool = m_renderer->GetPool(RENDER_FMT_MMAL, AV_PIX_FMT_YUV420P, true);
+  assert(m_pool);
+  MMAL_POOL_T *render_pool = m_pool->Get();
   assert(render_pool);
   if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s - queue(%p)", CLASSNAME, __func__, render_pool);

xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h

@@ -57,6 +57,7 @@ class CMMALBuffer : public IDVDResourceCounted<CMMALBuffer>
 
 class CMMALVideo;
 class CMMALRenderer;
+class CMMALPool;
 
 // a mmal video frame
 class CMMALVideoBuffer : public CMMALBuffer
@@ -140,6 +141,7 @@ class CMMALVideo : public CDVDVideoCodec
   MMAL_PORT_T *m_dec_output;
   MMAL_POOL_T *m_dec_input_pool;
   CMMALRenderer *m_renderer;
+  std::shared_ptr<CMMALPool> m_pool;
 
   MMAL_ES_FORMAT_T *m_es_format;
   MMAL_COMPONENT_T *m_deint;

xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp

@@ -307,7 +307,11 @@ int CDecoder::Decode(AVCodecContext* avctx, AVFrame* frame)
 
 MMAL_BUFFER_HEADER_T *CDecoder::GetMmal()
 {
-  MMAL_POOL_T *render_pool = m_renderer->GetPool(RENDER_FMT_MMAL, m_fmt, false);
+  if (!m_pool)
+    m_pool = m_renderer->GetPool(RENDER_FMT_MMAL, m_fmt, false);
+
+  assert(m_pool);
+  MMAL_POOL_T *render_pool = m_pool->Get();
   assert(render_pool);
   MMAL_BUFFER_HEADER_T *mmal_buffer = mmal_queue_timedwait(render_pool->queue, 500);
   if (!mmal_buffer)

xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.h

@@ -27,6 +27,7 @@
 #include "MMALCodec.h"
 
 class CMMALRenderer;
+class CMMALPool;
 struct MMAL_BUFFER_HEADER_T;
 class CGPUMEM;
 
@@ -76,6 +77,7 @@ class CDecoder
   unsigned int m_shared;
   CCriticalSection m_section;
   CMMALRenderer *m_renderer;
+  std::shared_ptr<CMMALPool> m_pool;
   std::deque<CGPUMEM *> m_freeBuffers;
   bool m_closing;
 };

xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp

@@ -39,7 +39,7 @@
 
 #define VERBOSE 0
 
-MMAL_POOL_T *CMMALRenderer::GetPool(ERenderFormat format, AVPixelFormat pixfmt, bool opaque)
+std::shared_ptr<CMMALPool> CMMALRenderer::GetPool(ERenderFormat format, AVPixelFormat pixfmt, bool opaque)
 {
   CSingleLock lock(m_sharedSection);
   bool formatChanged = m_format != format || m_opaque != opaque;
@@ -55,7 +55,7 @@ CRenderInfo CMMALRenderer::GetRenderInfo()
   CRenderInfo info;
 
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s cookie:%p", CLASSNAME, __func__, (void *)m_vout_input_pool);
+    CLog::Log(LOGDEBUG, "%s::%s opaque:%p", CLASSNAME, __func__, this);
 
   info.max_buffer_size = NUM_BUFFERS;
   info.optimal_buffer_size = NUM_BUFFERS;
@@ -113,6 +113,24 @@ static uint32_t pixfmt_to_encoding(AVPixelFormat pixfmt)
   return pixfmt_to_encoding_table[i].encoding;
 }
 
+CMMALPool::CMMALPool(MMAL_PORT_T *input, uint32_t num_buffers, uint32_t buffer_size)
+{
+  m_input = input;
+  m_pool = mmal_port_pool_create(input, num_buffers, buffer_size);
+  if (!m_pool)
+    CLog::Log(LOGERROR, "%s::%s Failed to create pool for decoder input port", CLASSNAME, __func__);
+  else
+    CLog::Log(LOGDEBUG, "%s::%s Created pool %p of size %d x %d", CLASSNAME, __func__, m_pool, num_buffers, buffer_size);
+}
+
+CMMALPool::~CMMALPool()
+{
+  CLog::Log(LOGDEBUG, "%s::%s destroying pool (%p)", CLASSNAME, __func__, m_pool);
+  mmal_port_pool_destroy(m_input, m_pool);
+  m_pool = nullptr;
+  m_input = nullptr;
+}
+
 bool CMMALRenderer::init_vout(ERenderFormat format, AVPixelFormat pixfmt, bool opaque)
 {
   CSingleLock lock(m_sharedSection);
@@ -193,13 +211,7 @@ bool CMMALRenderer::init_vout(ERenderFormat format, AVPixelFormat pixfmt, bool o
     return false;
   }
 
-  CLog::Log(LOGDEBUG, "%s::%s Created pool of size %d x %d", CLASSNAME, __func__, m_vout_input->buffer_num, m_vout_input->buffer_size);
-  m_vout_input_pool = mmal_port_pool_create(m_vout_input , m_vout_input->buffer_num, m_opaque ? m_vout_input->buffer_size:0);
-  if (!m_vout_input_pool)
-  {
-    CLog::Log(LOGERROR, "%s::%s Failed to create pool for decoder input port (status=%x %s)", CLASSNAME, __func__, status, mmal_status_to_string(status));
-    return false;
-  }
+  m_vout_input_pool = std::make_shared<CMMALPool>(m_vout_input, m_vout_input->buffer_num, m_opaque ? m_vout_input->buffer_size:0);
   if (!CSettings::GetInstance().GetBool("videoplayer.usedisplayasclock"))
   {
     m_queue = mmal_queue_create();
@@ -501,7 +513,7 @@ void CMMALRenderer::ReleaseBuffers()
 void CMMALRenderer::UnInitMMAL()
 {
   CSingleLock lock(m_sharedSection);
-  CLog::Log(LOGDEBUG, "%s::%s pool(%p)", CLASSNAME, __func__, m_vout_input_pool);
+  CLog::Log(LOGDEBUG, "%s::%s pool(%p)", CLASSNAME, __func__, m_vout_input_pool ? m_vout_input_pool->Get() : nullptr);
   if (m_queue)
   {
     StopThread(true);
@@ -521,11 +533,8 @@ void CMMALRenderer::UnInitMMAL()
 
   ReleaseBuffers();
 
-  if (m_vout_input_pool)
-  {
-    mmal_port_pool_destroy(m_vout_input, m_vout_input_pool);
-    m_vout_input_pool = NULL;
-  }
+  m_vout_input_pool = NULL;
+
   m_vout_input = NULL;
 
   if (m_vout)

xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h

@@ -43,6 +43,17 @@ class CMMALBuffer;
 
 struct DVDVideoPicture;
 
+class CMMALPool
+{
+public:
+  CMMALPool(MMAL_PORT_T *input, uint32_t num_buffers, uint32_t buffer_size);
+  ~CMMALPool();
+  MMAL_POOL_T *Get() { return m_pool; }
+protected:
+  MMAL_POOL_T *m_pool;
+  MMAL_PORT_T *m_input;
+};
+
 class CMMALRenderer : public CBaseRenderer, public CThread
 {
 public:
@@ -83,7 +94,7 @@ class CMMALRenderer : public CBaseRenderer, public CThread
   virtual bool         IsGuiLayer() { return false; }
 
   void vout_input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer);
-  MMAL_POOL_T *GetPool(ERenderFormat format, AVPixelFormat pixfmt, bool opaque);
+  std::shared_ptr<CMMALPool> GetPool(ERenderFormat format, AVPixelFormat pixfmt, bool opaque);
 protected:
   int m_iYV12RenderBuffer;
   int m_NumYV12Buffers;
@@ -108,7 +119,7 @@ class CMMALRenderer : public CBaseRenderer, public CThread
   CCriticalSection m_sharedSection;
   MMAL_COMPONENT_T *m_vout;
   MMAL_PORT_T *m_vout_input;
-  MMAL_POOL_T *m_vout_input_pool;
+  std::shared_ptr<CMMALPool> m_vout_input_pool;
   MMAL_QUEUE_T *m_queue;
   double m_error;