X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fvector-rasterize-thread.h;h=25bd4e5009aef0fda2c87d2228e82905d7657936;hp=f8d409bd31ea434556646dd8d35aa22e144485ae;hb=9ddd5fea6278d06b8874988498c7c4c6508750ba;hpb=cb624d6e60bfb8032e81f8adc71e14ebedc7e260 diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h index f8d409b..25bd4e5 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_VECTOR_IMAGE_RASTERIZE_THREAD_H /* - * Copyright (c) 2018 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. @@ -18,132 +18,51 @@ */ // EXTERNAL INCLUDES -#include -#include #include -#include #include -#include -#include +#include #include +#include // INTERNAL INCLUDES -#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - /** * The worker thread for vector image rasterization. */ class VectorRasterizeThread : public Thread { public: - /** * @brief Constructor. - * - * @param[in] url The url of the vector animation file */ - VectorRasterizeThread( const std::string& url ); + VectorRasterizeThread(); /** * @brief Destructor. */ - virtual ~VectorRasterizeThread(); + ~VectorRasterizeThread() override; /** - * @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. - */ - void RenderFrame(); - - /** - * @brief This callback is called after the first frame is ready. - * @param[in] callback The resource ready callback - */ - void SetResourceReadyCallback( EventThreadCallback* callback ); - - /** - * @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 + * @param[in] task The task to rasterize */ - void SetLoopCount( int32_t count ); - - /** - * @brief Gets the loop count. -1 means to repeat forever. - * @return The number of times to loop - */ - int32_t GetLoopCount() const; - - /** - * @brief Set the playing range. - * @param[in] range Two values between [0,1] to specify minimum and maximum progress. - * The animation will play between those values. - */ - void SetPlayRange( Vector2 range ); - - /** - * @brief Gets the playing range. - * @return The play range defined for the animation - */ - Vector2 GetPlayRange() const; - - /** - * @brief Get the play state - * @return The play state - */ - DevelImageVisual::PlayState GetPlayState() const; - - /** - * @brief Queries whether the resource is ready. - * @return true if ready, false otherwise - */ - bool IsResourceReady() const; + void AddTask(VectorAnimationTaskPtr task); protected: - /** * @brief The entry function of the worker thread. * It rasterizes the vector image. @@ -151,53 +70,25 @@ protected: void Run() override; private: - - /** - * @brief Called by the rasterize thread which ensures a wait if required. - * @return false if the thread should stop. - */ - bool IsThreadReady(); - /** - * @brief Start rendering - */ - bool StartRender(); - - /** - * @brief Rasterize the current frame. + * Rasterizes the tasks. */ void Rasterize(); +private: // Undefined - VectorRasterizeThread( const VectorRasterizeThread& thread ) = delete; + VectorRasterizeThread(const VectorRasterizeThread& thread) = delete; // Undefined - VectorRasterizeThread& operator=( const VectorRasterizeThread& thread ) = delete; + VectorRasterizeThread& operator=(const VectorRasterizeThread& thread) = delete; private: - - std::string mUrl; - VectorAnimationRenderer mVectorRenderer; - ConditionalWait mConditionalWait; - Dali::Mutex mMutex; - std::unique_ptr< EventThreadCallback > mResourceReadyTrigger; - std::unique_ptr< EventThreadCallback > mAnimationFinishedTrigger; - Vector2 mPlayRange; - DevelImageVisual::PlayState mPlayState; - float mProgress; - 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; - const Dali::LogFactoryInterface& mLogFactory; ///< The log factory - + std::vector mRasterizeTasks; + ConditionalWait mConditionalWait; + std::unique_ptr mCompletedCallback; + bool mDestroyThread; ///< Whether the thread be destroyed + bool mIsThreadStarted; + const Dali::LogFactoryInterface& mLogFactory; ///< The log factory }; } // namespace Internal