mmal: Make some of the more verbose logging a build time option

popcornmix · Jun 12, 2016 · 8dd4150 · 8dd4150
1 parent a68c218
commit 8dd4150
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
@@ -55,10 +55,12 @@ using namespace KODI::MESSAGING;
 
 #define CLASSNAME "CMMALVideoBuffer"
 
+#define VERBOSE 0
+
 CMMALVideoBuffer::CMMALVideoBuffer(CMMALVideo *omv)
     : m_omv(omv)
 {
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, this);
   mmal_buffer = NULL;
   m_width = 0;
@@ -73,7 +75,7 @@ CMMALVideoBuffer::~CMMALVideoBuffer()
 {
   if (mmal_buffer)
     mmal_buffer_header_release(mmal_buffer);
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, this);
 }
 
@@ -892,7 +894,7 @@ void CMMALVideo::Prime()
   assert(m_renderer);
   MMAL_POOL_T *render_pool = m_renderer->GetPool(RENDER_FMT_MMAL, true);
   assert(render_pool);
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s - queue(%p)", CLASSNAME, __func__, render_pool);
   while (buffer = mmal_queue_get(render_pool->queue), buffer)
     Recycle(buffer);
@@ -964,7 +966,7 @@ void CMMALVideo::SetSpeed(int iSpeed)
 void CMMALVideo::Recycle(MMAL_BUFFER_HEADER_T *buffer)
 {
   CSingleLock lock(m_sharedSection);
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, buffer);
 
   if (m_finished)
@@ -976,7 +978,7 @@ void CMMALVideo::Recycle(MMAL_BUFFER_HEADER_T *buffer)
   MMAL_STATUS_T status;
   mmal_buffer_header_reset(buffer);
   buffer->cmd = 0;
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s Send buffer %p from pool to decoder output port %p ready_queue(%d)", CLASSNAME, __func__, buffer, m_dec_output,
       m_output_ready.size());
   status = mmal_port_send_buffer(m_dec_output, buffer);
@@ -1050,7 +1052,7 @@ bool CMMALVideo::ClearPicture(DVDVideoPicture* pDvdVideoPicture)
   CSingleLock lock(m_sharedSection);
   if (pDvdVideoPicture->format == RENDER_FMT_MMAL)
   {
-    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
       CLog::Log(LOGDEBUG, "%s::%s - %p (%p)", CLASSNAME, __func__, pDvdVideoPicture->MMALBuffer, pDvdVideoPicture->MMALBuffer->mmal_buffer);
     pDvdVideoPicture->MMALBuffer->Release();
   }

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
@@ -37,6 +37,7 @@
 
 #define CLASSNAME "CMMALRenderer"
 
+#define VERBOSE 0
 
 MMAL_POOL_T *CMMALRenderer::GetPool(ERenderFormat format, bool opaque)
 {
@@ -68,8 +69,8 @@ void CMMALRenderer::vout_input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *
   assert(!(buffer->flags & MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED));
   buffer->flags &= ~MMAL_BUFFER_HEADER_FLAG_USER2;
   CMMALBuffer *omvb = (CMMALBuffer *)buffer->user_data;
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s YUV port:%p omvb:%p mmal:%p:%p len:%d cmd:%x flags:%x flight:%d", CLASSNAME, __func__, port, omvb, buffer, omvb->mmal_buffer, buffer->length, buffer->cmd, buffer->flags, m_inflight);
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s port:%p omvb:%p mmal:%p:%p len:%d cmd:%x flags:%x flight:%d", CLASSNAME, __func__, port, omvb, buffer, omvb->mmal_buffer, buffer->length, buffer->cmd, buffer->flags, m_inflight);
   assert(buffer == omvb->mmal_buffer);
   m_inflight--;
   omvb->Release();
@@ -248,7 +249,7 @@ void CMMALRenderer::AddVideoPictureHW(DVDVideoPicture& pic, int index)
 
   CMMALBuffer *buffer = pic.MMALBuffer;
   assert(buffer);
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s MMAL - %p (%p) %i", CLASSNAME, __func__, buffer, buffer->mmal_buffer, index);
 
   m_buffers[index] = buffer->Acquire();
@@ -312,7 +313,7 @@ void CMMALRenderer::ReleaseBuffer(int idx)
   }
 
   CMMALBuffer *omvb = m_buffers[idx];
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s - MMAL: source:%d omvb:%p mmal:%p flight:%d", CLASSNAME, __func__, idx, omvb, omvb ? omvb->mmal_buffer:NULL, m_inflight);
   if (omvb)
     SAFE_RELEASE(m_buffers[idx]);
@@ -434,7 +435,7 @@ void CMMALRenderer::FlipPage(int source)
     return;
   }
 
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s - source:%d", CLASSNAME, __func__, source);
 
   m_iYV12RenderBuffer = source;
@@ -461,7 +462,7 @@ void CMMALRenderer::PreInit()
 
 void CMMALRenderer::ReleaseBuffers()
 {
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+  if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s", CLASSNAME, __func__);
   for (int i=0; i<NUM_BUFFERS; i++)
     ReleaseBuffer(i);