X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-rasterize-thread.h;h=c9c305b1da4411ae3dd6edff717a6080e55d03f6;hb=13424a05f1a439bf4d72f168ca2fb7a35743ad43;hp=b915b133d60e182326b2b45314600e7248b54f12;hpb=6c62f5aa91b434193d0fc11b7763ba7286372fc4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h index b915b13..c9c305b 100644 --- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h +++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -29,10 +29,10 @@ #include #include #include -#include #include // INTERNAL INCLUDES +#include #include namespace Dali @@ -43,8 +43,9 @@ namespace Internal { class SvgVisual; typedef IntrusivePtr SvgVisualPtr; -class RasterizingTask; -typedef IntrusivePtr RasterizingTaskPtr; +class SvgTask; +typedef IntrusivePtr SvgTaskPtr; +class SvgRasterizeManager; /** * The svg rasterizing tasks to be processed in the worker thread. @@ -55,27 +56,40 @@ typedef IntrusivePtr RasterizingTaskPtr; * 3. If this task gets its turn to do the rasterization, it triggers main thread to apply the rasterized image to material then been deleted in main thread call back * Or if this task is been removed ( new image/size set to the visual or actor off stage) before its turn to be processed, it then been deleted in the worker thread. */ -class RasterizingTask : public RefObject +class SvgTask : public RefObject { public: /** * Constructor - * @param[in] svgRenderer The renderer which the rasterized image to be applied. - * @param[in] url The URL to svg resource to use. - * @param[in] width The rasterization width. - * @param[in] height The rasterization height. + * @param[in] svgVisual The visual which the rasterized image to be applied. + * @param[in] vectorRenderer The vector rasterizer. */ - RasterizingTask(SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height); + SvgTask(SvgVisual* svgVisual, VectorImageRenderer vectorRenderer); /** * Destructor. */ - ~RasterizingTask() override; + virtual ~SvgTask() = default; /** - * Do the rasterization with the mRasterizer. + * Process the task */ - void Rasterize(); + virtual void Process() = 0; + + /** + * Whether the task is ready to process. + * @return True if the task is ready to process. + */ + virtual bool IsReady() + { + return true; + } + + /** + * Whether the task has succeeded. + * @return True if the task has succeeded. + */ + bool HasSucceeded() const; /** * Get the svg visual @@ -86,46 +100,151 @@ public: * Get the rasterization result. * @return The pixel data with the rasterized pixels. */ - PixelData GetPixelData() const; + virtual PixelData GetPixelData() const; + +private: + // Undefined + SvgTask(const SvgTask& task) = delete; + + // Undefined + SvgTask& operator=(const SvgTask& task) = delete; +protected: + SvgVisualPtr mSvgVisual; + VectorImageRenderer mVectorRenderer; + bool mHasSucceeded; +}; + +class SvgLoadingTask : public SvgTask +{ +public: /** - * Get the VectorRenderer. - * @return VectorRenderer. + * Constructor + * @param[in] svgVisual The visual which the rasterized image to be applied. + * @param[in] vectorRenderer The vector rasterizer. + * @param[in] url The URL to svg resource to use. + * @param[in] dpi The DPI of the screen. */ - VectorImageRenderer GetVectorRenderer() const; + SvgLoadingTask(SvgVisual* svgVisual, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi); + /** - * Whether the resource is loaded. - * @return True if the resource is loaded. + * Destructor. */ - bool IsLoaded() const; + ~SvgLoadingTask() override; /** - * Load svg file + * Process the task */ - void Load(); + void Process() override; private: // Undefined - RasterizingTask(const RasterizingTask& task); + SvgLoadingTask(const SvgLoadingTask& task) = delete; // Undefined - RasterizingTask& operator=(const RasterizingTask& task); + SvgLoadingTask& operator=(const SvgLoadingTask& task) = delete; private: - SvgVisualPtr mSvgVisual; - VectorImageRenderer mVectorRenderer; - VisualUrl mUrl; - PixelData mPixelData; - float mDpi; - unsigned int mWidth; - unsigned int mHeight; - bool mLoadSuccess; + VisualUrl mUrl; + float mDpi; +}; + +class SvgRasterizingTask : public SvgTask +{ +public: + /** + * Constructor + * @param[in] svgVisual The visual which the rasterized image to be applied. + * @param[in] vectorRenderer The vector rasterizer. + * @param[in] width The rasterization width. + * @param[in] height The rasterization height. + */ + SvgRasterizingTask(SvgVisual* svgVisual, VectorImageRenderer vectorRenderer, unsigned int width, unsigned int height); + + /** + * Destructor. + */ + ~SvgRasterizingTask() override; + + /** + * Process the task accodring to the type + */ + void Process() override; + + /** + * Whether the task is ready to process. + * @return True if the task is ready to process. + */ + bool IsReady() override; + + /** + * Get the rasterization result. + * @return The pixel data with the rasterized pixels. + */ + PixelData GetPixelData() const override; + +private: + // Undefined + SvgRasterizingTask(const SvgRasterizingTask& task) = delete; + + // Undefined + SvgRasterizingTask& operator=(const SvgRasterizingTask& task) = delete; + +private: + PixelData mPixelData; + uint32_t mWidth; + uint32_t mHeight; }; /** * The worker thread for SVG rasterization. */ -class SvgRasterizeThread : public Thread, Integration::Processor +class SvgRasterizeThread : public Thread +{ +public: + /** + * Constructor. + */ + SvgRasterizeThread(SvgRasterizeManager& svgRasterizeManager); + + /** + * Destructor. + */ + ~SvgRasterizeThread() override; + + /** + * @brief Request the thread to rasterizes the task. + * @return True if the request succeeds, otherwise false. + */ + bool RequestRasterize(); + +protected: + /** + * The entry function of the worker thread. + * It rasterizes the image. + */ + void Run() override; + +private: + // Undefined + SvgRasterizeThread(const SvgRasterizeThread& thread) = delete; + + // Undefined + SvgRasterizeThread& operator=(const SvgRasterizeThread& thread) = delete; + +private: + ConditionalWait mConditionalWait; + const Dali::LogFactoryInterface& mLogFactory; + SvgRasterizeManager& mSvgRasterizeManager; + bool mDestroyThread; + bool mIsThreadStarted; + bool mIsThreadIdle; +}; + +/** + * The manager for SVG rasterization. + */ +class SvgRasterizeManager : Integration::Processor { public: /** @@ -133,26 +252,26 @@ public: * * @param[in] trigger The trigger to wake up the main thread. */ - SvgRasterizeThread(); + SvgRasterizeManager(); /** - * Terminate the svg rasterize thread, join and delete. + * Destructor. */ - static void TerminateThread(SvgRasterizeThread*& thread); + ~SvgRasterizeManager() override; /** * Add a rasterization task into the waiting queue, called by main thread. * * @param[in] task The task added to the queue. */ - void AddTask(RasterizingTaskPtr task); + void AddTask(SvgTaskPtr task); /** * Pop the next task out from the completed queue, called by main thread. * * @return The next task in the completed queue. */ - RasterizingTaskPtr NextCompletedTask(); + SvgTaskPtr NextCompletedTask(); /** * Remove the task with the given visual from the waiting queue, called by main thread. @@ -166,23 +285,23 @@ public: /** * @copydoc Dali::Integration::Processor::Process() */ - void Process() override; + void Process(bool postProcessor) override; -private: /** * Pop the next task out from the queue. * * @return The next task to be processed. */ - RasterizingTaskPtr NextTaskToProcess(); + SvgTaskPtr NextTaskToProcess(); /** * Add a task in to the queue * * @param[in] task The task added to the queue. */ - void AddCompletedTask(RasterizingTaskPtr task); + void AddCompletedTask(SvgTaskPtr task); +private: /** * Applies the rasterized image to material */ @@ -194,34 +313,59 @@ private: */ void UnregisterProcessor(); -protected: - /** - * Destructor. - */ - ~SvgRasterizeThread() override; - +private: /** - * The entry function of the worker thread. - * It fetches task from the Queue, rasterizes the image and apply to the renderer. + * @brief Helper class to keep the relation between SvgRasterizeThread and corresponding container */ - void Run() override; + class RasterizeHelper + { + public: + /** + * @brief Create an RasterizeHelper. + * + * @param[in] svgRasterizeManager Reference to the SvgRasterizeManager + */ + RasterizeHelper(SvgRasterizeManager& svgRasterizeManager); + + /** + * @brief Request the thread to rasterizes the task. + * @return True if the request succeeds, otherwise false. + */ + bool RequestRasterize(); + + public: + RasterizeHelper(const RasterizeHelper&) = delete; + RasterizeHelper& operator=(const RasterizeHelper&) = delete; + + RasterizeHelper(RasterizeHelper&& rhs); + RasterizeHelper& operator=(RasterizeHelper&& rhs) = delete; + + private: + /** + * @brief Main constructor that used by all other constructors + */ + RasterizeHelper(std::unique_ptr rasterizer, SvgRasterizeManager& svgRasterizeManager); + + private: + std::unique_ptr mRasterizer; + SvgRasterizeManager& mSvgRasterizeManager; + }; private: // Undefined - SvgRasterizeThread(const SvgRasterizeThread& thread); + SvgRasterizeManager(const SvgRasterizeManager& thread); // Undefined - SvgRasterizeThread& operator=(const SvgRasterizeThread& thread); + SvgRasterizeManager& operator=(const SvgRasterizeManager& thread); private: - std::vector mRasterizeTasks; //The queue of the tasks waiting to rasterize the SVG image - std::vector mCompletedTasks; //The queue of the tasks with the SVG rasterization completed + std::vector mRasterizeTasks; //The queue of the tasks waiting to rasterize the SVG image + std::vector mCompletedTasks; //The queue of the tasks with the SVG rasterization completed + + RoundRobinContainerView mRasterizers; - ConditionalWait mConditionalWait; Dali::Mutex mMutex; std::unique_ptr mTrigger; - const Dali::LogFactoryInterface& mLogFactory; - bool mIsThreadWaiting; bool mProcessorRegistered; };