[Tizen] Add lock for image loading

[platform/core/uifw/dali-adaptor.git] / dali / internal / imaging / common / webp-loading.cpp

diff --git a/dali/internal/imaging/common/webp-loading.cpp b/dali/internal/imaging/common/webp-loading.cpp
index d3031fa..f6e65b0 100644 (file)
--- a/dali/internal/imaging/common/webp-loading.cpp
+++ b/dali/internal/imaging/common/webp-loading.cpp
@@ -38,6 +38,7 @@
 #include <cstring>
 #include <dali/internal/imaging/common/file-download.h>
 #include <dali/internal/system/common/file-reader.h>
+#include <dali/devel-api/threading/mutex.h>
 
 typedef unsigned char WebPByteType;
 
@@ -66,7 +67,7 @@ struct WebPLoading::Impl
 public:
   Impl( const std::string& url, bool isLocalResource )
   : mUrl( url ),
-    mLoadingFrame( 0 )
+    mMutex()
   {
 #ifdef DALI_WEBP_ENABLED
     if( ReadWebPInformation( isLocalResource ) )
@@ -180,12 +181,13 @@ public:
 
   std::string mUrl;
   std::vector<uint32_t> mTimeStamp;
-  uint32_t mLoadingFrame;
+  uint32_t mLoadingFrame{0};
+  Mutex mMutex;
 
 #ifdef DALI_WEBP_ENABLED
-  WebPData mWebPData;
-  WebPAnimDecoder* mWebPAnimDecoder;
-  WebPAnimInfo mWebPAnimInfo;
+  WebPData mWebPData{0};
+  WebPAnimDecoder* mWebPAnimDecoder{nullptr};
+  WebPAnimInfo mWebPAnimInfo{0};
 #endif
 };
 
@@ -210,6 +212,7 @@ WebPLoading::~WebPLoading()
 bool WebPLoading::LoadNextNFrames( uint32_t frameStartIndex, int count, std::vector<Dali::PixelData> &pixelData )
 {
 #ifdef DALI_WEBP_ENABLED
+  Mutex::ScopedLock lock( mImpl->mMutex );
   if( frameStartIndex  >= mImpl->mWebPAnimInfo.frame_count )
   {
     return false;
@@ -263,6 +266,51 @@ bool WebPLoading::LoadNextNFrames( uint32_t frameStartIndex, int count, std::vec
 #endif
 }
 
+Dali::Devel::PixelBuffer WebPLoading::LoadFrame( uint32_t frameIndex )
+{
+  Dali::Devel::PixelBuffer pixelBuffer;
+#ifdef DALI_WEBP_ENABLED
+  Mutex::ScopedLock lock( mImpl->mMutex );
+  if( frameIndex  >= mImpl->mWebPAnimInfo.frame_count )
+  {
+    return pixelBuffer;
+  }
+
+  DALI_LOG_INFO( gWebPLoadingLogFilter, Debug::Concise, "LoadNextNFrames( frameIndex:%d )\n", frameIndex );
+
+  if( mImpl->mLoadingFrame > frameIndex  )
+  {
+    mImpl->mLoadingFrame = 0;
+    WebPAnimDecoderReset( mImpl->mWebPAnimDecoder );
+  }
+
+  for( ; mImpl->mLoadingFrame < frameIndex ; ++mImpl->mLoadingFrame )
+  {
+    uint8_t* frameBuffer;
+    int timestamp;
+    WebPAnimDecoderGetNext( mImpl->mWebPAnimDecoder, &frameBuffer, &timestamp );
+    mImpl->mTimeStamp[mImpl->mLoadingFrame] = timestamp;
+  }
+
+  const int bufferSize = mImpl->mWebPAnimInfo.canvas_width * mImpl->mWebPAnimInfo.canvas_height * sizeof( uint32_t );
+  uint8_t* frameBuffer;
+  int timestamp;
+  WebPAnimDecoderGetNext( mImpl->mWebPAnimDecoder, &frameBuffer, &timestamp );
+
+  pixelBuffer = Dali::Devel::PixelBuffer::New( mImpl->mWebPAnimInfo.canvas_width, mImpl->mWebPAnimInfo.canvas_height, Dali::Pixel::RGBA8888 );
+  memcpy( pixelBuffer.GetBuffer(), frameBuffer, bufferSize );
+  mImpl->mTimeStamp[mImpl->mLoadingFrame] = timestamp;
+
+  mImpl->mLoadingFrame++;
+  if( mImpl->mLoadingFrame >= mImpl->mWebPAnimInfo.frame_count )
+  {
+    mImpl->mLoadingFrame = 0;
+    WebPAnimDecoderReset( mImpl->mWebPAnimDecoder );
+  }
+#endif
+  return pixelBuffer;
+}
+
 ImageDimensions WebPLoading::GetImageSize() const
 {
 #ifdef DALI_WEBP_ENABLED
@@ -297,6 +345,11 @@ uint32_t WebPLoading::GetFrameInterval( uint32_t frameIndex ) const
   }
 }
 
+std::string WebPLoading::GetUrl() const
+{
+  return mImpl->mUrl;
+}
+
 } // namespace Adaptor
 
 } // namespace Internal