X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-image%2Frolling-image-cache.h;h=f57b5c2ec65c94f06bc9a7e4f27bcba2146f796c;hb=refs%2Fchanges%2F76%2F236076%2F13;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..f57b5c2 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) 2020 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.
@@ -34,7 +34,7 @@ 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:
   /**
@@ -60,17 +60,21 @@ public:
   virtual ~RollingImageCache();
 
   /**
-   * Get the first frame. If it's not ready, this will trigger the
+   * Get the Nth frame. If it's not ready, this will trigger the
    * sending of FrameReady() when the image becomes ready.
    */
-  virtual TextureSet FirstFrame();
+  TextureSet Frame( uint32_t frameIndex ) override;
 
   /**
-   * Get the next frame. If it's not ready, this will trigger the
+   * Get the first 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 FirstFrame() override;
+
+  /**
+   * Get the interval of Nth frame.
+   */
+  uint32_t GetFrameInterval( uint32_t frameIndex ) override;
 
 private:
   /**
@@ -106,12 +110,19 @@ private:
   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 +130,11 @@ private:
    */
   struct ImageFrame
   {
-    unsigned int mUrlIndex;
-    bool mReady;
+    unsigned int mUrlIndex = 0u;
+    bool mReady = false;
   };
 
+  std::vector<UrlStore>& mImageUrls;
   CircularQueue<ImageFrame> mQueue;
 };