X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-image%2Frolling-image-cache.h;h=1fcbe88ccc0c0bd7be549275e639c723d7aef4b3;hb=refs%2Fchanges%2F46%2F265846%2F1;hp=1aed9610d414a556dbbccc6beff3d921f1ccb94d;hpb=886ad3dc35609a01504e03707996a4c102ef23e7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
index 1aed961..1fcbe88 100644
--- a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
+++ b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ROLLING_IMAGE_CACHE_H
 
 /*
- * 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.
@@ -19,9 +19,9 @@
 
 // EXTERNAL INCLUDES
 
-#include <dali/devel-api/common/circular-queue.h>
 #include <dali-toolkit/internal/visuals/animated-image/image-cache.h>
 #include <dali-toolkit/internal/visuals/texture-manager-impl.h>
+#include <dali/devel-api/common/circular-queue.h>
 
 namespace Dali
 {
@@ -29,12 +29,11 @@ namespace Toolkit
 {
 namespace Internal
 {
-
 /**
  * Class to manage a rolling cache of images, where the cache size
  * is smaller than the total number of images.
  */
-class RollingImageCache : public ImageCache
+class RollingImageCache : public ImageCache, public TextureUploadObserver
 {
 public:
   /**
@@ -48,29 +47,50 @@ public:
    * This will start loading textures immediately, according to the
    * batch and cache sizes.
    */
-  RollingImageCache( TextureManager&                 textureManager,
-                     UrlList&                        urlList,
-                     ImageCache::FrameReadyObserver& observer,
-                     uint16_t                        cacheSize,
-                     uint16_t                        batchSize );
+  RollingImageCache(TextureManager&                 textureManager,
+                    UrlList&                        urlList,
+                    ImageCache::FrameReadyObserver& observer,
+                    uint16_t                        cacheSize,
+                    uint16_t                        batchSize);
 
   /**
    * Destructor
    */
-  virtual ~RollingImageCache();
+  ~RollingImageCache() override;
+
+  /**
+   * Get the Nth frame. If it's not ready, this will trigger the
+   * sending of FrameReady() when the image becomes ready.
+   */
+  TextureSet Frame(uint32_t frameIndex) override;
 
   /**
    * Get the first frame. If it's not ready, this will trigger the
    * sending of FrameReady() when the image becomes ready.
    */
-  virtual TextureSet FirstFrame();
+  TextureSet FirstFrame() override;
 
   /**
    * Get the next frame. If it's not ready, this will trigger the
    * sending of FrameReady() when the image becomes ready.
-   * This will trigger the loading of the next batch.
    */
-  virtual TextureSet NextFrame();
+  TextureSet NextFrame() override;
+
+  /**
+   * Get the interval of Nth frame.
+   */
+  uint32_t GetFrameInterval(uint32_t frameIndex) const override;
+
+  /**
+   * Get the current rendered frame index.
+   * If there isn't any loaded frame, returns -1.
+   */
+  int32_t GetCurrentFrameIndex() const override;
+
+  /**
+   * Get total frame count of the animated image file.
+   */
+  int32_t GetTotalFrameCount() const override;
 
 private:
   /**
@@ -86,7 +106,7 @@ private:
   /**
    * Find the matching image frame, and set it to ready
    */
-  void SetImageFrameReady( TextureManager::TextureId textureId );
+  void SetImageFrameReady(TextureManager::TextureId textureId);
 
   /**
    * Get the texture set of the front frame.
@@ -97,21 +117,28 @@ private:
   /**
    * Get the texture id of the given index
    */
-  TextureManager::TextureId GetCachedTextureId( int index ) const;
+  TextureManager::TextureId GetCachedTextureId(int index) const;
 
   /**
    * Check if the front frame has become ready - if so, inform observer
    * @param[in] wasReady Readiness before call.
    */
-  void CheckFrontFrame( bool wasReady );
+  void CheckFrontFrame(bool wasReady);
 
 protected:
-  virtual void UploadComplete(
+  void UploadComplete(
     bool           loadSuccess,
     int32_t        textureId,
     TextureSet     textureSet,
     bool           useAtlasing,
-    const Vector4& atlasRect );
+    const Vector4& atlasRect,
+    bool           preMultiplied) override;
+
+  void LoadComplete(
+    bool               loadSuccess,
+    Devel::PixelBuffer pixelBuffer,
+    const VisualUrl&   url,
+    bool               preMultiplied) override;
 
 private:
   /**
@@ -119,10 +146,11 @@ private:
    */
   struct ImageFrame
   {
-    unsigned int mUrlIndex;
-    bool mReady;
+    unsigned int mUrlIndex = 0u;
+    bool         mReady    = false;
   };
 
+  std::vector<UrlStore>&    mImageUrls;
   CircularQueue<ImageFrame> mQueue;
 };