X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-image%2Ffixed-image-cache.cpp;h=4593bc7b777a02866f6163435a5365dc38a644ce;hb=b8da2e53925b9abb9fa362560069e8ca4aa62f81;hp=d60834f58b83dd187ad25d1db37f94dd326b4dcc;hpb=46322a558e537267a6d3c48630c45afca91b5e27;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
index d60834f..4593bc7 100644
--- a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
+++ b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,36 +17,61 @@
 // CLASS HEADER
 #include <dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h>
 
+// INTERNAL HEADERS
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h> // For ImageAtlasManagerPtr
+
 namespace Dali
 {
 namespace Toolkit
 {
 namespace Internal
 {
+namespace
+{
+const bool ENABLE_ORIENTATION_CORRECTION(true);
+} // namespace
 
 FixedImageCache::FixedImageCache(
-  TextureManager& textureManager, UrlList& urlList, ImageCache::FrameReadyObserver& observer,
-  unsigned int batchSize )
-: ImageCache( textureManager, urlList, observer, batchSize ),
+  TextureManager& textureManager, UrlList& urlList, ImageCache::FrameReadyObserver& observer, unsigned int batchSize)
+: ImageCache(textureManager, observer, batchSize),
+  mImageUrls(urlList),
   mFront(0u)
 {
-  mReadyFlags.reserve( mImageUrls.size() );
+  mReadyFlags.reserve(mImageUrls.size());
   LoadBatch();
 }
 
 FixedImageCache::~FixedImageCache()
 {
-  for( std::size_t i = 0; i < mImageUrls.size() ; ++i )
+  if(mTextureManagerAlive)
   {
-    mTextureManager.Remove( mImageUrls[i].mTextureId );
+    for(std::size_t i = 0; i < mImageUrls.size(); ++i)
+    {
+      mTextureManager.Remove(mImageUrls[i].mTextureId, this);
+    }
   }
 }
 
-TextureSet FixedImageCache::FirstFrame()
+TextureSet FixedImageCache::Frame(uint32_t frameIndex)
 {
-  TextureSet textureSet = GetFrontTextureSet();
+  while(frameIndex > mFront)
+  {
+    ++mFront;
+    if(mFront >= mImageUrls.size())
+    {
+      mFront = 0;
+    }
+    LoadBatch();
+  }
+
+  mFront = frameIndex;
 
-  if( ! textureSet )
+  TextureSet textureSet;
+  if(IsFrontReady() == true)
+  {
+    textureSet = GetFrontTextureSet();
+  }
+  else
   {
     mWaitingForReadyFrame = true;
   }
@@ -54,29 +79,43 @@ TextureSet FixedImageCache::FirstFrame()
   return textureSet;
 }
 
-TextureSet FixedImageCache::NextFrame()
+TextureSet FixedImageCache::FirstFrame()
 {
-  TextureSet textureSet;
-  ++mFront;
-  mFront %= mImageUrls.size();
+  TextureSet textureSet = GetFrontTextureSet();
 
-  if( IsFrontReady() == true )
-  {
-    textureSet = GetFrontTextureSet();
-  }
-  else
+  if(!textureSet)
   {
     mWaitingForReadyFrame = true;
   }
 
-  LoadBatch();
+  return textureSet;
+}
+
+TextureSet FixedImageCache::NextFrame()
+{
+  TextureSet textureSet = Frame((mFront + 1) % mImageUrls.size());
 
   return textureSet;
 }
 
+uint32_t FixedImageCache::GetFrameInterval(uint32_t frameIndex) const
+{
+  return 0u;
+}
+
+int32_t FixedImageCache::GetCurrentFrameIndex() const
+{
+  return static_cast<int32_t>(mFront);
+}
+
+int32_t FixedImageCache::GetTotalFrameCount() const
+{
+  return mImageUrls.size();
+}
+
 bool FixedImageCache::IsFrontReady() const
 {
-  return ( mReadyFlags.size() > 0 && mReadyFlags[mFront] == true );
+  return (mReadyFlags.size() > 0 && mReadyFlags[mFront] == true);
 }
 
 void FixedImageCache::LoadBatch()
@@ -84,11 +123,11 @@ void FixedImageCache::LoadBatch()
   // Try and load up to mBatchSize images, until the cache is filled.
   // Once the cache is filled, mUrlIndex exceeds mImageUrls size and
   // no more images are loaded.
-  bool frontFrameReady = IsFrontReady();;
+  bool frontFrameReady = IsFrontReady();
 
-  for( unsigned int i=0; i< mBatchSize && mUrlIndex < mImageUrls.size(); ++i )
+  for(unsigned int i = 0; i < mBatchSize && mUrlIndex < mImageUrls.size(); ++i)
   {
-    std::string& url = mImageUrls[ mUrlIndex ].mUrl;
+    std::string& url = mImageUrls[mUrlIndex].mUrl;
 
     mReadyFlags.push_back(false);
 
@@ -97,22 +136,35 @@ void FixedImageCache::LoadBatch()
     // need to account for this inside the UploadComplete method using mRequestingLoad.
     mRequestingLoad = true;
 
-    mImageUrls[ mUrlIndex ].mTextureId =
-      mTextureManager.RequestLoad( url, ImageDimensions(), FittingMode::SCALE_TO_FILL,
-                                   SamplingMode::BOX_THEN_LINEAR, TextureManager::NO_ATLAS,
-                                   this );
+    bool                               synchronousLoading = false;
+    bool                               atlasingStatus     = false;
+    bool                               loadingStatus      = false;
+    TextureManager::MaskingDataPointer maskInfo           = nullptr;
+    AtlasUploadObserver*               atlasObserver      = nullptr;
+    ImageAtlasManagerPtr               imageAtlasManager  = nullptr;
+    Vector4                            textureRect;
+    Dali::ImageDimensions              textureRectSize;
+    auto                               preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
+
+    mTextureManager.LoadTexture(
+      url, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, maskInfo, synchronousLoading, mImageUrls[mUrlIndex].mTextureId, textureRect, textureRectSize, atlasingStatus, loadingStatus, Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT, this, atlasObserver, imageAtlasManager, ENABLE_ORIENTATION_CORRECTION, TextureManager::ReloadPolicy::CACHED, preMultiply);
+
+    if(loadingStatus == false) // not loading, means it's already ready.
+    {
+      SetImageFrameReady(mImageUrls[mUrlIndex].mTextureId);
+    }
     mRequestingLoad = false;
     ++mUrlIndex;
   }
 
-  CheckFrontFrame( frontFrameReady );
+  CheckFrontFrame(frontFrameReady);
 }
 
-void FixedImageCache::SetImageFrameReady( TextureManager::TextureId textureId )
+void FixedImageCache::SetImageFrameReady(TextureManager::TextureId textureId)
 {
-  for( std::size_t i = 0; i < mImageUrls.size() ; ++i )
+  for(std::size_t i = 0; i < mImageUrls.size(); ++i)
   {
-    if( mImageUrls[i].mTextureId == textureId )
+    if(mImageUrls[i].mTextureId == textureId)
     {
       mReadyFlags[i] = true;
       break;
@@ -122,15 +174,15 @@ void FixedImageCache::SetImageFrameReady( TextureManager::TextureId textureId )
 
 TextureSet FixedImageCache::GetFrontTextureSet() const
 {
-  return mTextureManager.GetTextureSet( mImageUrls[mFront].mTextureId );
+  return mTextureManager.GetTextureSet(mImageUrls[mFront].mTextureId);
 }
 
-void FixedImageCache::CheckFrontFrame( bool wasReady )
+void FixedImageCache::CheckFrontFrame(bool wasReady)
 {
-  if( mWaitingForReadyFrame && wasReady == false && IsFrontReady() )
+  if(mWaitingForReadyFrame && wasReady == false && IsFrontReady())
   {
     mWaitingForReadyFrame = false;
-    mObserver.FrameReady( GetFrontTextureSet() );
+    mObserver.FrameReady(GetFrontTextureSet());
   }
 }
 
@@ -139,15 +191,16 @@ void FixedImageCache::UploadComplete(
   int32_t        textureId,
   TextureSet     textureSet,
   bool           useAtlasing,
-  const Vector4& atlasRect )
+  const Vector4& atlasRect,
+  bool           preMultiplied)
 {
   bool frontFrameReady = IsFrontReady();
 
-  if( ! mRequestingLoad )
+  if(!mRequestingLoad)
   {
-    SetImageFrameReady( textureId );
+    SetImageFrameReady(textureId);
 
-    CheckFrontFrame( frontFrameReady );
+    CheckFrontFrame(frontFrameReady);
   }
   else
   {
@@ -158,6 +211,17 @@ void FixedImageCache::UploadComplete(
   }
 }
 
+void FixedImageCache::LoadComplete(
+  bool               loadSuccess,
+  Devel::PixelBuffer pixelBuffer,
+  const VisualUrl&   url,
+  bool               preMultiplied)
+{
+  // LoadComplete is called if this TextureUploadObserver requested to load
+  // an image that will be returned as a type of PixelBuffer by using a method
+  // TextureManager::LoadPixelBuffer.
+}
+
 } //namespace Internal
 } //namespace Toolkit
-} //namespace Dali
+} //namespace Dali
\ No newline at end of file