X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fimage-loader%2Fimage-load-thread.h;h=319f7509b3c82044b9651f833cc5da938c9fac21;hp=b435611b57ba135243ba486e029e92b719a73978;hb=0d81c2ea24d4e6f1e20d387a3e6c17c04c861a81;hpb=73bd6099851981f1e166a809105e2096c5620303 diff --git a/dali-toolkit/internal/image-loader/image-load-thread.h b/dali-toolkit/internal/image-loader/image-load-thread.h index b435611..319f750 100644 --- a/dali-toolkit/internal/image-loader/image-load-thread.h +++ b/dali-toolkit/internal/image-loader/image-load-thread.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_IMAGE_LOAD_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. @@ -18,27 +18,25 @@ */ // EXTERNAL INCLUDES -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - /** * The task of loading and packing an image into the atlas. */ @@ -49,10 +47,12 @@ struct LoadingTask * @param [in] id of the task * @param [in] animatedImageLoading The AnimatedImageLoading to load animated image * @param [in] frameIndex The frame index of a frame to be loaded frame + * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask. */ - LoadingTask( uint32_t id, - Dali::AnimatedImageLoading animatedImageLoading, - uint32_t frameIndex ); + LoadingTask(uint32_t id, + Dali::AnimatedImageLoading animatedImageLoading, + uint32_t frameIndex, + DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad); /** * Constructor. @@ -64,13 +64,31 @@ struct LoadingTask * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header. * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask. */ - LoadingTask( uint32_t id, - const VisualUrl& url, - ImageDimensions dimensions, - FittingMode::Type fittingMode, - SamplingMode::Type samplingMode, - bool orientationCorrection, - DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad ); + LoadingTask(uint32_t id, + const VisualUrl& url, + ImageDimensions dimensions, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection, + DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad); + + /** + * Constructor. + * @param [in] id of the task + * @param [in] encodedImageBuffer The encoded buffer of the image to load. + * @param [in] size The width and height to fit the loaded image to, 0.0 means whole image + * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter. + * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size. + * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header. + * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha or if the image need to be applied alpha mask. + */ + LoadingTask(uint32_t id, + const EncodedImageBuffer& encodedImageBuffer, + ImageDimensions dimensions, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection, + DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad); /** * Constructor. @@ -81,12 +99,12 @@ struct LoadingTask * @param [in] cropToMask Whether to crop the content to the mask size * @param [in] preMultiplyOnLoad ON if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha. */ - LoadingTask( uint32_t id, - Devel::PixelBuffer pixelBuffer, - Devel::PixelBuffer maskPixelBuffer, - float contentScale, - bool cropToMask, - DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad ); + LoadingTask(uint32_t id, + Devel::PixelBuffer pixelBuffer, + Devel::PixelBuffer maskPixelBuffer, + float contentScale, + bool cropToMask, + DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad); /** * Load the image @@ -104,52 +122,49 @@ struct LoadingTask void MultiplyAlpha(); private: - // Undefined - LoadingTask( const LoadingTask& queue ); + LoadingTask(const LoadingTask& queue); // Undefined - LoadingTask& operator=( const LoadingTask& queue ); + LoadingTask& operator=(const LoadingTask& queue); public: - - Devel::PixelBuffer pixelBuffer; ///< pixelBuffer handle after successful load - ///< or pixelBuffer to be masked image in the mask task - VisualUrl url; ///< url of the image to load - uint32_t id; ///< The unique id associated with this task. - ImageDimensions dimensions; ///< dimensions to load - FittingMode::Type fittingMode; ///< fitting options - SamplingMode::Type samplingMode; ///< sampling options - bool orientationCorrection:1; ///< if orientation correction is needed - DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad; //< if the image's color should be multiplied by it's alpha - - bool isMaskTask; ///< whether this task is for mask or not - Devel::PixelBuffer maskPixelBuffer; ///< pixelBuffer of mask image - float contentScale; ///< The factor to scale the content - bool cropToMask; ///< Whether to crop the content to the mask size + Devel::PixelBuffer pixelBuffer; ///< pixelBuffer handle after successful load + ///< or pixelBuffer to be masked image in the mask task + VisualUrl url; ///< url of the image to load + EncodedImageBuffer encodedImageBuffer; ///< encoded buffer of the image to load + uint32_t id; ///< The unique id associated with this task. + ImageDimensions dimensions; ///< dimensions to load + FittingMode::Type fittingMode; ///< fitting options + SamplingMode::Type samplingMode; ///< sampling options + bool orientationCorrection : 1; ///< if orientation correction is needed + DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad; //< if the image's color should be multiplied by it's alpha + + bool isMaskTask; ///< whether this task is for mask or not + Devel::PixelBuffer maskPixelBuffer; ///< pixelBuffer of mask image + float contentScale; ///< The factor to scale the content + bool cropToMask; ///< Whether to crop the content to the mask size Dali::AnimatedImageLoading animatedImageLoading; - uint32_t frameIndex; + uint32_t frameIndex; }; - /** * The worker thread for image loading. */ class ImageLoadThread : public Thread { public: - /** * Constructor. * * @param[in] mTrigger The trigger to wake up the main thread. */ - ImageLoadThread( EventThreadCallback* mTrigger ); + ImageLoadThread(EventThreadCallback* mTrigger); /** * Destructor. */ - virtual ~ImageLoadThread(); + ~ImageLoadThread() override; /** * Add a task in to the loading queue @@ -158,7 +173,7 @@ public: * * @note This class takes ownership of the task object */ - void AddTask( LoadingTask* task ); + void AddTask(LoadingTask* task); /** * Pop the next task out from the completed queue. @@ -170,7 +185,7 @@ public: /** * Remove the loading task from the waiting queue. */ - bool CancelTask( uint32_t loadingTaskId ); + bool CancelTask(uint32_t loadingTaskId); /** * Remove all the loading tasks in the waiting queue. @@ -178,7 +193,6 @@ public: void CancelAll(); private: - /** * Pop the next loading task out from the queue to process. * @@ -191,33 +205,30 @@ private: * * @param[in] task The task added to the queue. */ - void AddCompletedTask( LoadingTask* task ); + void AddCompletedTask(LoadingTask* task); protected: - /** * The entry function of the worker thread. * It fetches loading task from the loadQueue, loads the image and adds to the completeQueue. */ - virtual void Run(); + void Run() override; private: - // Undefined - ImageLoadThread( const ImageLoadThread& thread ); + ImageLoadThread(const ImageLoadThread& thread); // Undefined - ImageLoadThread& operator=( const ImageLoadThread& thread ); + ImageLoadThread& operator=(const ImageLoadThread& thread); private: - - Vector< LoadingTask* > mLoadQueue; /// mCompleteQueue; /// mLoadQueue; /// mCompleteQueue; ///