#define DALI_TOOLKIT_VECTOR_IMAGE_RASTERIZE_THREAD_H
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
*/
// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
-#include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
+//#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
#include <dali/devel-api/threading/conditional-wait.h>
-#include <dali/devel-api/threading/mutex.h>
#include <dali/devel-api/threading/thread.h>
#include <dali/integration-api/adaptors/log-factory-interface.h>
-#include <string>
+#include <vector>
#include <memory>
+//#include <string>
// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h>
namespace Dali
{
{
public:
- using UploadCompletedSignalType = Dali::VectorAnimationRenderer::UploadCompletedSignalType;
-
/**
* @brief Constructor.
- *
- * @param[in] url The url of the vector animation file
*/
- VectorRasterizeThread( const std::string& url );
+ VectorRasterizeThread();
/**
* @brief Destructor.
virtual ~VectorRasterizeThread();
/**
- * @brief Sets the renderer used to display the result image.
- *
- * @param[in] renderer The renderer used to display the result image
+ * The callback is called from the rasterize thread after the rasterization is completed.
+ * @param[in] callBack The function to call.
*/
- void SetRenderer( Renderer renderer );
+ void SetCompletedCallback( CallbackBase* callback );
/**
- * @brief Sets the target image size.
+ * Add a task to rasterize.
*
- * @param[in] width The target image width
- * @param[in] height The target image height
- */
- void SetSize( uint32_t width, uint32_t height );
-
- /**
- * @brief Play the vector animation.
- */
- void PlayAnimation();
-
- /**
- * @brief Stop the vector animation.
- */
- void StopAnimation();
-
- /**
- * @brief Pause the vector animation.
- */
- void PauseAnimation();
-
- /**
- * @brief Render one frame. The current frame number will be increased.
+ * @param[in] task The task to rasterize
*/
- void RenderFrame();
-
- /**
- * @brief This callback is called after the animation is finished.
- * @param[in] callback The animation finished callback
- */
- void SetAnimationFinishedCallback( EventThreadCallback* callback );
-
- /**
- * @brief Enable looping for 'count' repeats. -1 means to repeat forever.
- * @param[in] count The number of times to loop
- */
- void SetLoopCount( int32_t count );
-
- /**
- * @brief Set the playing range in frame number.
- * @param[in] startFrame The frame number to specify minimum progress.
- * @param[in] endFrame The frame number to specify maximum progress.
- * The animation will play between those values.
- */
- void SetPlayRange( uint32_t startFrame, uint32_t endFrame );
-
- /**
- * @brief Get the play state
- * @return The play state
- */
- DevelImageVisual::PlayState::Type GetPlayState() const;
-
- /**
- * @brief Queries whether the resource is ready.
- * @return true if ready, false otherwise
- */
- bool IsResourceReady() const;
-
- /**
- * @brief Sets the current frame number of the animation.
- * @param[in] frameNumber The new frame number between [0, the maximum frame number] or between the play range if specified.
- */
- void SetCurrentFrameNumber( uint32_t frameNumber );
-
- /**
- * @brief Retrieves the current frame number of the animation.
- * @return The current frame number
- */
- uint32_t GetCurrentFrameNumber() const;
-
- /**
- * @brief Retrieves the total frame number of the animation.
- * @return The total frame number
- */
- uint32_t GetTotalFrameNumber() const;
-
- /**
- * @brief Gets the default size of the file,.
- * @return The default size of the file
- */
- void GetDefaultSize( uint32_t& width, uint32_t& height ) const;
-
- /**
- * @brief Sets the stop behavior of the animation. This is performed when the animation is stopped.
- * @param[in] stopBehavior The stop behavior
- */
- void SetStopBehavior( DevelImageVisual::StopBehavior::Type stopBehavior );
-
- /**
- * @brief Sets the looping mode.
- * Animation plays forwards and then restarts from the beginning or runs backwards again.
- * @param[in] loopingMode The looping mode
- */
- void SetLoopingMode( DevelImageVisual::LoopingMode::Type loopingMode );
-
- /**
- * @brief Connect to this signal to be notified when the texture upload is completed.
- * @return The signal to connect to.
- */
- UploadCompletedSignalType& UploadCompletedSignal();
+ void AddTask( VectorAnimationTaskPtr task );
protected:
private:
/**
- * @brief Initializes the vector renderer.
- */
- void Initialize();
-
- /**
- * @brief Rasterizes the current frame.
+ * Rasterizes the tasks.
*/
void Rasterize();
- /**
- * @brief Gets the frame number when the animation is stopped according to the stop behavior.
- */
- uint32_t GetStoppedFrame( uint32_t startFrame, uint32_t endFrame, uint32_t currentFrame );
+private:
// Undefined
VectorRasterizeThread( const VectorRasterizeThread& thread ) = delete;
private:
- enum class PlayState
- {
- STOPPING, ///< The animation is stopping
- STOPPED, ///< The animation has stopped
- PLAYING, ///< The animation is playing
- PAUSED ///< The animation is paused
- };
-
- std::string mUrl;
- VectorAnimationRenderer mVectorRenderer;
- ConditionalWait mConditionalWait;
- std::unique_ptr< EventThreadCallback > mAnimationFinishedTrigger;
- Vector2 mPlayRange;
- PlayState mPlayState;
- DevelImageVisual::StopBehavior::Type mStopBehavior;
- DevelImageVisual::LoopingMode::Type mLoopingMode;
- int64_t mFrameDurationNanoSeconds;
- float mFrameRate;
- uint32_t mCurrentFrame;
- uint32_t mTotalFrame;
- uint32_t mStartFrame;
- uint32_t mEndFrame;
- uint32_t mWidth;
- uint32_t mHeight;
- int32_t mLoopCount;
- int32_t mCurrentLoop;
- bool mNeedRender;
- bool mDestroyThread; ///< Whether the thread be destroyed
- bool mResourceReady;
- bool mCurrentFrameUpdated;
- bool mForward;
- bool mUpdateFrameNumber;
- const Dali::LogFactoryInterface& mLogFactory; ///< The log factory
+ std::vector< VectorAnimationTaskPtr > mRasterizeTasks;
+ ConditionalWait mConditionalWait;
+ std::unique_ptr< CallbackBase > mCompletedCallback;
+ bool mDestroyThread; ///< Whether the thread be destroyed
+ bool mIsThreadStarted;
+ const Dali::LogFactoryInterface& mLogFactory; ///< The log factory
};
projects / platform / core / uifw / dali-toolkit.git / blobdiff