projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.9.24] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
fixed-image-cache.h
diff --git
a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
index
570b2d7
..
5063232
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
+++ b/
dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_FIXED_IMAGE_CACHE_H
/*
#define DALI_TOOLKIT_INTERNAL_FIXED_IMAGE_CACHE_H
/*
- * Copyright (c) 20
17
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-49,17
+49,21
@@
public:
virtual ~FixedImageCache();
/**
virtual ~FixedImageCache();
/**
- * 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.
*/
* sending of FrameReady() when the image becomes ready.
*/
-
virtual TextureSet FirstFrame()
;
+
TextureSet Frame( uint32_t frameIndex ) override
;
/**
/**
- * Get the
nex
t frame. If it's not ready, this will trigger the
+ * Get the
firs
t frame. If it's not ready, this will trigger the
* sending of FrameReady() when the image becomes ready.
* 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:
/**
private:
/**
@@
-90,13
+94,19
@@
private:
void CheckFrontFrame( bool wasReady );
protected:
void CheckFrontFrame( bool wasReady );
protected:
- v
irtual v
oid UploadComplete(
+ void UploadComplete(
bool loadSuccess,
int32_t textureId,
TextureSet textureSet,
bool useAtlasing,
const Vector4& atlasRect,
bool loadSuccess,
int32_t textureId,
TextureSet textureSet,
bool useAtlasing,
const Vector4& atlasRect,
- bool premultiplied) override;
+ bool premultiplied ) override;
+
+ void LoadComplete(
+ bool loadSuccess,
+ Devel::PixelBuffer pixelBuffer,
+ const VisualUrl& url,
+ bool preMultiplied ) override;
private:
std::vector<UrlStore>& mImageUrls;
private:
std::vector<UrlStore>& mImageUrls;