Revert "[mmalrenderer] Wait for vsync before submitting to mmal when …

…display sync is disabled" This reverts commit 9b669d0f9abd1a40a5229677952c8134e74ffa6c.
popcornmix · Aug 4, 2015 · 98c58a2 · 98c58a2
1 parent 6eeb47f
commit 98c58a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
@@ -208,7 +208,6 @@ CMMALRenderer::CMMALRenderer()
   m_bMMALConfigured = false;
   m_iYV12RenderBuffer = 0;
   m_sharpness = -2.0f;
-  m_vsyncCount = ~0;
 }
 
 CMMALRenderer::~CMMALRenderer()
@@ -358,25 +357,6 @@ void CMMALRenderer::Update()
   ManageDisplay();
 }
 
-void CMMALRenderer::SubmitFrame(MMAL_BUFFER_HEADER_T *buffer)
-{
-  if (!CSettings::Get().GetBool("videoplayer.usedisplayasclock"))
-  {
-    if (fabs(m_fps - g_graphicsContext.GetFPS()) < 1e-2)
-    {
-      #if defined(MMAL_DEBUG_VERBOSE)
-      CLog::Log(LOGDEBUG, "%s::%s - buffer:%p vfps:%.3f dfps:%.3f vsync:%d dsync:%d", CLASSNAME, __func__, buffer, m_fps, g_graphicsContext.GetFPS(), m_vsyncCount, CSettings::Get().GetBool("videoplayer.usedisplayasclock"));
-      #endif
-      CSingleExit lock(g_graphicsContext);
-      m_vsyncCount = g_RBP.WaitVsync(m_vsyncCount) + 1;
-      #if defined(MMAL_DEBUG_VERBOSE)
-      CLog::Log(LOGDEBUG, "%s::%s - done vsync:%d", CLASSNAME, __func__, m_vsyncCount);
-      #endif
-    }
-  }
-  mmal_port_send_buffer(m_vout_input, buffer);
-}
-
 void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
 {
   CSingleLock lock(m_sharedSection);
@@ -422,7 +402,7 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
         return;
       omvb->Acquire();
       omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
-      SubmitFrame(omvb->mmal_buffer);
+      mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
     }
     else
       CLog::Log(LOGDEBUG, "%s::%s - No buffer to update", CLASSNAME, __func__);
@@ -437,7 +417,7 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
         return;
       // sanity check it is not on display
       buffer->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
-      SubmitFrame(buffer->mmal_buffer);
+      mmal_port_send_buffer(m_vout_input, buffer->mmal_buffer);
     }
     else
       CLog::Log(LOGDEBUG, "%s::%s - No buffer to update", CLASSNAME, __func__);

diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.h b/xbmc/cores/VideoRenderers/MMALRenderer.h
@@ -99,7 +99,6 @@ class CMMALRenderer : public CBaseRenderer
   unsigned int         m_destWidth;
   unsigned int         m_destHeight;
   int                  m_neededBuffers;
-  int                  m_vsyncCount;
 
   CRect                     m_src_rect;
   CRect                     m_dst_rect;
@@ -116,5 +115,4 @@ class CMMALRenderer : public CBaseRenderer
   bool init_vout(ERenderFormat format);
   void ReleaseBuffers();
   void UnInitMMAL();
-  void SubmitFrame(MMAL_BUFFER_HEADER_T *buffer);
 };