[rbp/omxplayer] Cosmetic: Remove option to deinit a component without freeing it

We always free a component when deiniting, so remove the option to avoid a way of leaking resources

diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
index 9634c81..69b087b 100644 (file)
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
@@ -727,15 +727,15 @@ bool COMXAudio::Deinitialize()
 
   m_omx_decoder.FlushInput();
 
-  m_omx_decoder.Deinitialize(true);
+  m_omx_decoder.Deinitialize();
   if ( m_omx_mixer.IsInitialized() )
-    m_omx_mixer.Deinitialize(true);
+    m_omx_mixer.Deinitialize();
   if ( m_omx_splitter.IsInitialized() )
-    m_omx_splitter.Deinitialize(true);
+    m_omx_splitter.Deinitialize();
   if ( m_omx_render_hdmi.IsInitialized() )
-    m_omx_render_hdmi.Deinitialize(true);
+    m_omx_render_hdmi.Deinitialize();
   if ( m_omx_render_analog.IsInitialized() )
-    m_omx_render_analog.Deinitialize(true);
+    m_omx_render_analog.Deinitialize();
 
   m_BytesPerSec = 0;
   m_BufferLen   = 0;

diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp
index 89e82d8..3bf716d 100644 (file)
--- a/xbmc/cores/omxplayer/OMXImage.cpp
+++ b/xbmc/cores/omxplayer/OMXImage.cpp
@@ -917,9 +917,9 @@ void COMXImageDec::Close()
   if(m_omx_tunnel_decode.IsInitialized())
     m_omx_tunnel_decode.Deestablish();
   if(m_omx_decoder.IsInitialized())
-    m_omx_decoder.Deinitialize(true);
+    m_omx_decoder.Deinitialize();
   if(m_omx_resize.IsInitialized())
-    m_omx_resize.Deinitialize(true);
+    m_omx_resize.Deinitialize();
 }
 
 bool COMXImageDec::HandlePortSettingChange(unsigned int resize_width, unsigned int resize_height)
@@ -1189,7 +1189,7 @@ COMXImageEnc::~COMXImageEnc()
   OMX_INIT_STRUCTURE(m_encoded_format);
   m_encoded_buffer = NULL;
   if(m_omx_encoder.IsInitialized())
-    m_omx_encoder.Deinitialize(true);
+    m_omx_encoder.Deinitialize();
 }
 
 bool COMXImageEnc::Encode(unsigned char *buffer, int size, unsigned width, unsigned height, unsigned int pitch)
@@ -1435,11 +1435,11 @@ void COMXImageReEnc::Close()
   if(m_omx_tunnel_resize.IsInitialized())
     m_omx_tunnel_resize.Deestablish();
   if(m_omx_decoder.IsInitialized())
-    m_omx_decoder.Deinitialize(true);
+    m_omx_decoder.Deinitialize();
   if(m_omx_resize.IsInitialized())
-    m_omx_resize.Deinitialize(true);
+    m_omx_resize.Deinitialize();
   if(m_omx_encoder.IsInitialized())
-    m_omx_encoder.Deinitialize(true);
+    m_omx_encoder.Deinitialize();
 }
 
 
@@ -1824,11 +1824,11 @@ void COMXTexture::Close()
     m_omx_tunnel_egl.Deestablish();
   // delete components
   if (m_omx_decoder.IsInitialized())
-    m_omx_decoder.Deinitialize(true);
+    m_omx_decoder.Deinitialize();
   if (m_omx_resize.IsInitialized())
-    m_omx_resize.Deinitialize(true);
+    m_omx_resize.Deinitialize();
   if (m_omx_egl_render.IsInitialized())
-    m_omx_egl_render.Deinitialize(true);
+    m_omx_egl_render.Deinitialize();
 }
 
 bool COMXTexture::HandlePortSettingChange(unsigned int resize_width, unsigned int resize_height, void *egl_image, void *egl_display, bool port_settings_changed)

diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
index cb7d5d1..0a5a980 100644 (file)
--- a/xbmc/cores/omxplayer/OMXVideo.cpp
+++ b/xbmc/cores/omxplayer/OMXVideo.cpp
@@ -686,11 +686,11 @@ void COMXVideo::Close()
 
   m_omx_decoder.FlushInput();
 
-  m_omx_sched.Deinitialize(true);
-  m_omx_decoder.Deinitialize(true);
+  m_omx_sched.Deinitialize();
+  m_omx_decoder.Deinitialize();
   if(m_deinterlace)
-    m_omx_image_fx.Deinitialize(true);
-  m_omx_render.Deinitialize(true);
+    m_omx_image_fx.Deinitialize();
+  m_omx_render.Deinitialize();
 
   m_is_open       = false;
 

diff --git a/xbmc/linux/OMXClock.cpp b/xbmc/linux/OMXClock.cpp
index ced4f0d..ef121d9 100644 (file)
--- a/xbmc/linux/OMXClock.cpp
+++ b/xbmc/linux/OMXClock.cpp
@@ -141,7 +141,7 @@ void OMXClock::OMXDeinitialize()
   if(m_omx_clock.GetComponent() == NULL)
     return;
 
-  m_omx_clock.Deinitialize(true);
+  m_omx_clock.Deinitialize();
 
   m_omx_speed = DVD_PLAYSPEED_NORMAL;
 }

diff --git a/xbmc/linux/OMXCore.cpp b/xbmc/linux/OMXCore.cpp
index db01a33..7f9d777 100644 (file)
--- a/xbmc/linux/OMXCore.cpp
+++ b/xbmc/linux/OMXCore.cpp
@@ -351,7 +351,7 @@ COMXCoreComponent::COMXCoreComponent()
 
 COMXCoreComponent::~COMXCoreComponent()
 {
-  Deinitialize(true);
+  Deinitialize();
 
   pthread_mutex_destroy(&m_omx_input_mutex);
   pthread_mutex_destroy(&m_omx_output_mutex);
@@ -1442,7 +1442,7 @@ bool COMXCoreComponent::Initialize( const std::string &component_name, OMX_INDEX
     {
       CLog::Log(LOGERROR, "COMXCoreComponent::Initialize - could not get component handle for %s omx_err(0x%08x)\n",
           component_name.c_str(), (int)omx_err);
-      Deinitialize(true);
+      Deinitialize();
       return false;
     }
   }
@@ -1501,7 +1501,7 @@ void COMXCoreComponent::ResetEos()
   pthread_mutex_unlock(&m_omx_eos_mutex);
 }
 
-bool COMXCoreComponent::Deinitialize(bool free_component /* = false */)
+bool COMXCoreComponent::Deinitialize()
 {
   OMX_ERRORTYPE omx_err;
 
@@ -1519,23 +1519,20 @@ bool COMXCoreComponent::Deinitialize(bool free_component /* = false */)
 
     TransitionToStateLoaded();
 
-    if(free_component)
+    CLog::Log(LOGDEBUG, "COMXCoreComponent::Deinitialize : %s handle %p\n",
+        m_componentName.c_str(), m_handle);
+    omx_err = m_DllOMX->OMX_FreeHandle(m_handle);
+    if (omx_err != OMX_ErrorNone)
     {
-      CLog::Log(LOGDEBUG, "COMXCoreComponent::Deinitialize : %s handle %p\n",
-          m_componentName.c_str(), m_handle);
-      omx_err = m_DllOMX->OMX_FreeHandle(m_handle);
-      if (omx_err != OMX_ErrorNone)
-      {
-        CLog::Log(LOGERROR, "COMXCoreComponent::Deinitialize - failed to free handle for component %s omx_err(0x%08x)",
-            m_componentName.c_str(), omx_err);
-      }  
-      m_handle = NULL;
-
-      m_input_port      = 0;
-      m_output_port     = 0;
-      m_componentName   = "";
-      m_resource_error  = false;
+      CLog::Log(LOGERROR, "COMXCoreComponent::Deinitialize - failed to free handle for component %s omx_err(0x%08x)",
+          m_componentName.c_str(), omx_err);
     }
+    m_handle = NULL;
+
+    m_input_port      = 0;
+    m_output_port     = 0;
+    m_componentName   = "";
+    m_resource_error  = false;
   }
 
   return true;

diff --git a/xbmc/linux/OMXCore.h b/xbmc/linux/OMXCore.h
index 5057a0d..4ad64e1 100644 (file)
--- a/xbmc/linux/OMXCore.h
+++ b/xbmc/linux/OMXCore.h
@@ -112,7 +112,7 @@ public:
 
   bool          Initialize( const std::string &component_name, OMX_INDEXTYPE index);
   bool          IsInitialized();
-  bool          Deinitialize(bool free_component = false);
+  bool          Deinitialize();
 
   // OMXCore Decoder delegate callback routines.
   static OMX_ERRORTYPE DecoderEventHandlerCallback(OMX_HANDLETYPE hComponent, OMX_PTR pAppData,