X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-rasterize-thread.h;h=0204befb124d9b5e1017efb1fdce98e9246dcf6d;hb=83d145f1006f5e5309f660b3ec4e211eecaecf31;hp=5c8b323e37af613c86bc429694fa1ecfd847f083;hpb=f11be450471738b68f98fa4c552b3a22482ae4de;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 5c8b323..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,37 +19,32 @@ // EXTERNAL INCLUDES #include +#include #include #include #include -#include +#include +#include #include #include +#include #include #include -#include +#include -#ifdef NO_THORVG -struct NSVGimage; -struct NSVGrasterizer; -#else /* NO_THORVG */ -#include -#include -#endif /* NO_THORVG */ +// 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. @@ -63,30 +58,14 @@ typedef IntrusivePtr< RasterizingTask > RasterizingTaskPtr; class RasterizingTask : public RefObject { public: -#ifdef NO_THORVG - /** - * 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 ); -#else /* NO_THORVG */ /** * 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] loaded The svg resource is loaded or not. */ - RasterizingTask( SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height, bool loaded ); -#endif /* NO_THORVG */ + RasterizingTask(SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height); /** * Destructor. @@ -96,7 +75,7 @@ public: /** * Do the rasterization with the mRasterizer. */ - void Rasterize( ); + void Rasterize(); /** * Get the svg visual @@ -109,20 +88,6 @@ public: */ PixelData GetPixelData() const; -#ifdef NO_THORVG - /** - * Get the parsed data. - * @return parsed image data. - */ - NSVGimage* GetParsedImage() const; - /** - * Get default size of svg - * - * @param[out] width The default width of svg - * @param[out] height The default height of svg - */ - void GetDefaultSize( uint32_t& width, uint32_t& height ) const; -#else /* NO_THORVG */ /** * Get the VectorRenderer. * @return VectorRenderer. @@ -133,7 +98,6 @@ public: * @return True if the resource is loaded. */ bool IsLoaded() const; -#endif /* NO_THORVG */ /** * Load svg file @@ -142,55 +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; -#ifdef NO_THORVG - NSVGimage* mParsedSvg; -#else /* NO_THORVG */ + SvgVisualPtr mSvgVisual; VectorImageRenderer mVectorRenderer; -#endif /* NO_THORVG */ - VisualUrl mUrl; - PixelData mPixelData; - float mDpi; - unsigned int mWidth; - unsigned int mHeight; -#ifdef NO_THORVG - NSVGrasterizer* mRasterizer; -#else /* NO_THORVG */ - bool mLoaded; -#endif /* NO_THORVG */ + 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. @@ -206,30 +161,14 @@ public: * * @param[in] visual The visual pointer. */ - void RemoveTask( SvgVisual* visual ); + void RemoveTask(SvgVisual* visual); -#ifdef NO_THORVG /** - * Delete the parsed SVG image, called by main thread. - * - * The parsed svg should be deleted 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 ); -#else /* NO_THORVG */ - /** - * Delete the parsed SVG image, called by main thread. - * - * The parsed svg should be deleted in worker thread, as the main thread does not know whether a rasterization of this svg is ongoing. - * - * @param[in] VectorImage The image to be deleted - */ - void DeleteImage( VectorImageRenderer vectorImage ); -#endif /* NO_THORVG */ + void Process(bool postProcessor) override; private: - /** * Pop the next task out from the queue. * @@ -242,16 +181,25 @@ 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(); /** + * @brief Unregister a previously registered processor + * + */ + void UnregisterProcessor(); + +protected: + /** * Destructor. */ ~SvgRasterizeThread() override; - /** * The entry function of the worker thread. * It fetches task from the Queue, rasterizes the image and apply to the renderer. @@ -259,28 +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 -#ifdef NO_THORVG - Vector mDeleteSvg; //The images that the event thread requested to delete -#else /* NO_THORVG */ - Vector mDeleteSvg; //The images that the event thread requested to delete -#endif /* NO_THORVG */ - - 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