[omx/image] fixed move global lock to the function begin and protect …

…close

xbmc/cores/omxplayer/OMXImage.cpp

@@ -79,6 +79,8 @@ COMXImage::~COMXImage()
 
 void COMXImage::Close()
 {
+  CSingleLock lock(g_OMXSection);
+
   OMX_INIT_STRUCTURE(m_decoded_format);
   OMX_INIT_STRUCTURE(m_encoded_format);
   memset(&m_omx_image, 0x0, sizeof(OMX_IMAGE_PORTDEFINITIONTYPE));
@@ -502,6 +504,8 @@ bool COMXImage::ReadFile(const CStdString& inputFile)
 
 bool COMXImage::Decode(unsigned width, unsigned height)
 {
+  CSingleLock lock(g_OMXSection);
+
   std::string componentName = "";
   bool m_firstFrame = true;
   unsigned int demuxer_bytes = 0;
@@ -511,8 +515,6 @@ bool COMXImage::Decode(unsigned width, unsigned height)
 
   OMX_INIT_STRUCTURE(m_decoded_format);
 
-  CSingleLock lock(g_OMXSection);
-
   if(!m_image_buffer)
   {
     CLog::Log(LOGERROR, "%s::%s no input buffer\n", CLASSNAME, __func__);
@@ -772,6 +774,8 @@ bool COMXImage::Decode(unsigned width, unsigned height)
 
 bool COMXImage::Encode(unsigned char *buffer, int size, unsigned width, unsigned height)
 {
+  CSingleLock lock(g_OMXSection);
+
   std::string componentName = "";
   unsigned int demuxer_bytes = 0;
   const uint8_t *demuxer_content = NULL;
@@ -780,8 +784,6 @@ bool COMXImage::Encode(unsigned char *buffer, int size, unsigned width, unsigned
   OMX_BUFFERHEADERTYPE *omx_buffer = NULL;
   OMX_INIT_STRUCTURE(m_encoded_format);
 
-  CSingleLock lock(g_OMXSection);
-
   if (!buffer || !size) 
   {
     CLog::Log(LOGERROR, "%s::%s error no buffer\n", CLASSNAME, __func__);