X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-rasterize-thread.cpp;h=273f08b682d11c14440524f51de3c4ef89cf8874;hb=12bb2c4f931e07cf3b4bfa90252a0940fcd74363;hp=75286cad6c48de2ad1fc11694b9c62df8dc0d182;hpb=8fea8f2ae64923690519e0de039ce4af51271d9f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp index 75286ca..273f08b 100644 --- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp @@ -1,5 +1,5 @@ /* - * 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,8 +19,8 @@ #include "svg-rasterize-thread.h" // EXTERNAL INCLUDES -#include #include +#include #include #include @@ -29,23 +29,19 @@ namespace Dali { - namespace Toolkit { - namespace Internal { - -RasterizingTask::RasterizingTask( SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height, bool loaded) -: mSvgVisual( svgRenderer ), - mVectorRenderer( vectorRenderer ), - mUrl( url ), - mDpi( dpi ), - mWidth( width ), - mHeight( height ), - mLoaded( loaded ) +RasterizingTask::RasterizingTask(SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height) +: mSvgVisual(svgRenderer), + mVectorRenderer(vectorRenderer), + mUrl(url), + mDpi(dpi), + mWidth(width), + mHeight(height), + mLoadSuccess(false) { - } RasterizingTask::~RasterizingTask() @@ -54,7 +50,7 @@ RasterizingTask::~RasterizingTask() void RasterizingTask::Load() { - if(!mLoaded && !mUrl.IsLocalResource()) + if(!mUrl.IsLocalResource()) { Dali::Vector remoteBuffer; if(!Dali::FileLoader::DownloadFileSynchronously(mUrl.GetUrl(), remoteBuffer)) @@ -71,7 +67,11 @@ void RasterizingTask::Load() return; } - mLoaded = true; + mLoadSuccess = true; + } + else + { + mLoadSuccess = true; } } @@ -108,7 +108,7 @@ VectorImageRenderer RasterizingTask::GetVectorRenderer() const bool RasterizingTask::IsLoaded() const { - return mLoaded; + return mLoadSuccess; } SvgVisual* RasterizingTask::GetSvgVisual() const @@ -121,23 +121,28 @@ PixelData RasterizingTask::GetPixelData() const return mPixelData; } -SvgRasterizeThread::SvgRasterizeThread( EventThreadCallback* trigger ) -: mTrigger( std::unique_ptr< EventThreadCallback >(trigger) ), - mLogFactory( Dali::Adaptor::Get().GetLogFactory() ), - mIsThreadWaiting( false ) +SvgRasterizeThread::SvgRasterizeThread() +: mTrigger(new EventThreadCallback(MakeCallback(this, &SvgRasterizeThread::ApplyRasterizedSVGToSampler))), + mLogFactory(Dali::Adaptor::Get().GetLogFactory()), + mIsThreadWaiting(false), + mProcessorRegistered(false) { } SvgRasterizeThread::~SvgRasterizeThread() { + if(mProcessorRegistered) + { + Adaptor::Get().UnregisterProcessor(*this); + } } -void SvgRasterizeThread::TerminateThread( SvgRasterizeThread*& thread ) +void SvgRasterizeThread::TerminateThread(SvgRasterizeThread*& thread) { - if( thread ) + if(thread) { // add an empty task would stop the thread from conditional wait. - thread->AddTask( RasterizingTaskPtr() ); + thread->AddTask(RasterizingTaskPtr()); // stop the thread thread->Join(); // delete the thread @@ -146,31 +151,37 @@ void SvgRasterizeThread::TerminateThread( SvgRasterizeThread*& thread ) } } -void SvgRasterizeThread::AddTask( RasterizingTaskPtr task ) +void SvgRasterizeThread::AddTask(RasterizingTaskPtr task) { bool wasEmpty = false; { // Lock while adding task to the queue - ConditionalWait::ScopedLock lock( mConditionalWait ); + ConditionalWait::ScopedLock lock(mConditionalWait); wasEmpty = mRasterizeTasks.empty(); - if( !wasEmpty && task != NULL) + if(!wasEmpty && task != NULL) { // Remove the tasks with the same renderer. // Older task which waiting to rasterize and apply the svg to the same renderer is expired. - for( std::vector< RasterizingTaskPtr >::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it ) + for(std::vector::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it) { - if( (*it) && (*it)->GetSvgVisual() == task->GetSvgVisual() ) + if((*it) && (*it)->GetSvgVisual() == task->GetSvgVisual()) { - mRasterizeTasks.erase( it ); + mRasterizeTasks.erase(it); break; } } } - mRasterizeTasks.push_back( task ); + mRasterizeTasks.push_back(task); + + if(!mProcessorRegistered) + { + Adaptor::Get().RegisterProcessor(*this); + mProcessorRegistered = true; + } } - if( wasEmpty) + if(wasEmpty) { // wake up the image loading thread mConditionalWait.Notify(); @@ -180,84 +191,65 @@ void SvgRasterizeThread::AddTask( RasterizingTaskPtr task ) RasterizingTaskPtr SvgRasterizeThread::NextCompletedTask() { // Lock while popping task out from the queue - Mutex::ScopedLock lock( mMutex ); + Mutex::ScopedLock lock(mMutex); - if( mCompletedTasks.empty() ) + if(mCompletedTasks.empty()) { return RasterizingTaskPtr(); } - std::vector< RasterizingTaskPtr >::iterator next = mCompletedTasks.begin(); - RasterizingTaskPtr nextTask = *next; - mCompletedTasks.erase( next ); + std::vector::iterator next = mCompletedTasks.begin(); + RasterizingTaskPtr nextTask = *next; + mCompletedTasks.erase(next); return nextTask; } -void SvgRasterizeThread::RemoveTask( SvgVisual* visual ) +void SvgRasterizeThread::RemoveTask(SvgVisual* visual) { // Lock while remove task from the queue - ConditionalWait::ScopedLock lock( mConditionalWait ); - if( !mRasterizeTasks.empty() ) + ConditionalWait::ScopedLock lock(mConditionalWait); + if(!mRasterizeTasks.empty()) { - for( std::vector< RasterizingTaskPtr >::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it ) + for(std::vector::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it) { - if( (*it) && (*it)->GetSvgVisual() == visual ) + if((*it) && (*it)->GetSvgVisual() == visual) { - mRasterizeTasks.erase( it ); + mRasterizeTasks.erase(it); break; } } } -} - -void SvgRasterizeThread::DeleteImage( VectorImageRenderer vectorRenderer ) -{ - // Lock while adding image to the delete queue - ConditionalWait::ScopedLock lock( mConditionalWait ); - if( mIsThreadWaiting ) // no rasterization is ongoing, save to delete - { - // TODO: what? - } - else // wait to delete until current rasterization completed. - { - mDeleteSvg.PushBack( &vectorRenderer ); - } + UnregisterProcessor(); } RasterizingTaskPtr SvgRasterizeThread::NextTaskToProcess() { // Lock while popping task out from the queue - ConditionalWait::ScopedLock lock( mConditionalWait ); - - // Delete the image here to make sure that it is not used in the nsvgRasterize() - if( !mDeleteSvg.Empty() ) - { - mDeleteSvg.Clear(); - } + ConditionalWait::ScopedLock lock(mConditionalWait); // conditional wait - while( mRasterizeTasks.empty() ) + while(mRasterizeTasks.empty()) { mIsThreadWaiting = true; - mConditionalWait.Wait( lock ); + mConditionalWait.Wait(lock); } mIsThreadWaiting = false; // pop out the next task from the queue - std::vector< RasterizingTaskPtr >::iterator next = mRasterizeTasks.begin(); - RasterizingTaskPtr nextTask = *next; - mRasterizeTasks.erase( next ); + std::vector::iterator next = mRasterizeTasks.begin(); + RasterizingTaskPtr nextTask = *next; + mRasterizeTasks.erase(next); return nextTask; } -void SvgRasterizeThread::AddCompletedTask( RasterizingTaskPtr task ) +void SvgRasterizeThread::AddCompletedTask(RasterizingTaskPtr task) { // Lock while adding task to the queue - Mutex::ScopedLock lock( mMutex ); - mCompletedTasks.push_back( task ); + Mutex::ScopedLock lock(mMutex); + mCompletedTasks.push_back(task); // wake up the main thread mTrigger->Trigger(); @@ -265,14 +257,41 @@ void SvgRasterizeThread::AddCompletedTask( RasterizingTaskPtr task ) void SvgRasterizeThread::Run() { - SetThreadName( "SVGThread" ); + SetThreadName("SVGThread"); mLogFactory.InstallLogFunction(); - while( RasterizingTaskPtr task = NextTaskToProcess() ) + while(RasterizingTaskPtr task = NextTaskToProcess()) + { + task->Load(); + task->Rasterize(); + AddCompletedTask(task); + } +} + +void SvgRasterizeThread::ApplyRasterizedSVGToSampler() +{ + while(RasterizingTaskPtr task = NextCompletedTask()) { - task->Load( ); - task->Rasterize( ); - AddCompletedTask( task ); + task->GetSvgVisual()->ApplyRasterizedImage(task->GetVectorRenderer(), task->GetPixelData(), task->IsLoaded()); + } + + UnregisterProcessor(); +} + +void SvgRasterizeThread::Process(bool postProcessor) +{ + ApplyRasterizedSVGToSampler(); +} + +void SvgRasterizeThread::UnregisterProcessor() +{ + if(mProcessorRegistered) + { + if(mRasterizeTasks.empty() && mCompletedTasks.empty()) + { + Adaptor::Get().UnregisterProcessor(*this); + mProcessorRegistered = false; + } } }