X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-rasterize-thread.h;h=0204befb124d9b5e1017efb1fdce98e9246dcf6d;hp=e01020e42f673e97323e0908737efb695eb87be3;hb=7018f61b640b6fcf9cb576b537bafcb6bb8240e8;hpb=d25a273548ad9aecd10e01447383d5c6dba40400 diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h index e01020e..0204bef 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) 2020 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. @@ -19,32 +19,32 @@ // EXTERNAL INCLUDES #include +#include #include #include #include -#include +#include +#include #include #include +#include #include #include -#include +#include -struct NSVGimage; -struct NSVGrasterizer; +// INTERNAL INCLUDES +#include namespace Dali { - namespace Toolkit { - namespace Internal { - class SvgVisual; -typedef IntrusivePtr< SvgVisual > SvgVisualPtr; +typedef IntrusivePtr SvgVisualPtr; class RasterizingTask; -typedef IntrusivePtr< RasterizingTask > RasterizingTaskPtr; +typedef IntrusivePtr RasterizingTaskPtr; /** * The svg rasterizing tasks to be processed in the worker thread. @@ -60,26 +60,22 @@ class RasterizingTask : public RefObject public: /** * Constructor - * * @param[in] svgRenderer The renderer which the rasterized image to be applied. - * @param[in] parsedSvg The parsed svg for rasterizing. - * Note, after the task is added to the worker thread, the worker thread takes over the ownership. - * When the image is to be deleted, delete it in the worker thread by calling SvgRasterizeThread::DeleteImage( parsedSvg ). * @param[in] url The URL to svg resource to use. * @param[in] width The rasterization width. * @param[in] height The rasterization height. */ - RasterizingTask( SvgVisual* svgRenderer, NSVGimage* parsedSvg, const VisualUrl& url, float dpi, unsigned int width, unsigned int height ); + RasterizingTask(SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height); /** * Destructor. */ - ~RasterizingTask(); + ~RasterizingTask() override; /** * Do the rasterization with the mRasterizer. */ - void Rasterize( ); + void Rasterize(); /** * Get the svg visual @@ -93,10 +89,15 @@ public: PixelData GetPixelData() const; /** - * Get the parsed data. - * @return parsed image data. + * Get the VectorRenderer. + * @return VectorRenderer. + */ + VectorImageRenderer GetVectorRenderer() const; + /** + * Whether the resource is loaded. + * @return True if the resource is loaded. */ - NSVGimage* GetParsedImage() const; + bool IsLoaded() const; /** * Load svg file @@ -105,47 +106,46 @@ public: private: // Undefined - RasterizingTask( const RasterizingTask& task ); + RasterizingTask(const RasterizingTask& task); // Undefined - RasterizingTask& operator=( const RasterizingTask& task ); + RasterizingTask& operator=(const RasterizingTask& task); private: - SvgVisualPtr mSvgVisual; - NSVGimage* mParsedSvg; - VisualUrl mUrl; - PixelData mPixelData; - float mDpi; - unsigned int mWidth; - unsigned int mHeight; - NSVGrasterizer* mRasterizer; + SvgVisualPtr mSvgVisual; + VectorImageRenderer mVectorRenderer; + VisualUrl mUrl; + PixelData mPixelData; + float mDpi; + unsigned int mWidth; + unsigned int mHeight; + bool mLoadSuccess; }; /** * The worker thread for SVG rasterization. */ -class SvgRasterizeThread : public Thread +class SvgRasterizeThread : public Thread, Integration::Processor { public: - /** * Constructor. * * @param[in] trigger The trigger to wake up the main thread. */ - SvgRasterizeThread( EventThreadCallback* trigger ); + SvgRasterizeThread(); /** * Terminate the svg rasterize thread, join and delete. */ - static void TerminateThread( SvgRasterizeThread*& thread ); + static void TerminateThread(SvgRasterizeThread*& thread); /** * 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(RasterizingTaskPtr task); /** * Pop the next task out from the completed queue, called by main thread. @@ -161,19 +161,14 @@ public: * * @param[in] visual The visual pointer. */ - void RemoveTask( SvgVisual* visual ); + void RemoveTask(SvgVisual* visual); /** - * Delete the parsed SVG image, called by main thread. - * - * The parsed svg should be delelted in worker thread, as the main thread does not know whether a rasterization of this svg is ongoing. - * - * @param[in] parsedImage The image to be deleted + * @copydoc Dali::Integration::Processor::Process() */ - void DeleteImage( NSVGimage* parsedSvg ); + void Process(bool postProcessor) override; private: - /** * Pop the next task out from the queue. * @@ -186,15 +181,24 @@ private: * * @param[in] task The task added to the queue. */ - void AddCompletedTask( RasterizingTaskPtr task ); + void AddCompletedTask(RasterizingTaskPtr task); -protected: + /** + * Applies the rasterized image to material + */ + void ApplyRasterizedSVGToSampler(); /** - * Destructor. + * @brief Unregister a previously registered processor + * */ - virtual ~SvgRasterizeThread(); + void UnregisterProcessor(); +protected: + /** + * Destructor. + */ + ~SvgRasterizeThread() override; /** * The entry function of the worker thread. @@ -203,24 +207,22 @@ protected: void Run() override; private: - // Undefined - SvgRasterizeThread( const SvgRasterizeThread& thread ); + SvgRasterizeThread(const SvgRasterizeThread& thread); // Undefined - SvgRasterizeThread& operator=( const SvgRasterizeThread& thread ); + SvgRasterizeThread& operator=(const SvgRasterizeThread& 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 - Vector mDeleteSvg; //The images that the event thread requested to delete - - ConditionalWait mConditionalWait; - Dali::Mutex mMutex; - EventThreadCallback* mTrigger; - - bool mIsThreadWaiting; + 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 + + ConditionalWait mConditionalWait; + Dali::Mutex mMutex; + std::unique_ptr mTrigger; + const Dali::LogFactoryInterface& mLogFactory; + bool mIsThreadWaiting; + bool mProcessorRegistered; }; } // namespace Internal