From cd7dc06c6d16fa60bb27a2454b7e79cdf4d4d7a2 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 13 Aug 2019 18:43:40 +0900 Subject: [PATCH] (Vector) Fix some issues - Remove unused function - Not update the current frame if the value is same Change-Id: I262b5bea4a7e035b7d478f5c777e27f4adc8e7cb --- .../toolkit-vector-animation-renderer.cpp | 9 --------- .../visuals/animated-vector-image/vector-rasterize-thread.cpp | 9 +++------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp index 8e856bb..e13a65b 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp @@ -66,10 +66,6 @@ public: } } - void StopRender() - { - } - bool Render( uint32_t frameNumber ) { if( frameNumber == 1 && mPreviousFrame != frameNumber ) @@ -171,11 +167,6 @@ void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height ) Internal::Adaptor::GetImplementation( *this ).SetSize( width, height ); } -void VectorAnimationRenderer::StopRender() -{ - Internal::Adaptor::GetImplementation( *this ).StopRender(); -} - bool VectorAnimationRenderer::Render( uint32_t frameNumber ) { return Internal::Adaptor::GetImplementation( *this ).Render( frameNumber ); diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp index fead5de..9469dae 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp @@ -93,9 +93,6 @@ VectorRasterizeThread::~VectorRasterizeThread() ConditionalWait::ScopedLock lock( mConditionalWait ); mDestroyThread = true; mConditionalWait.Notify( lock ); - - // This should be called in the main thread to stop waiting for the dequeuable buffer. - mVectorRenderer.StopRender(); } DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::~VectorRasterizeThread: Join [%p]\n", this ); @@ -294,7 +291,7 @@ void VectorRasterizeThread::SetCurrentFrameNumber( uint32_t frameNumber ) { ConditionalWait::ScopedLock lock( mConditionalWait ); - if( frameNumber >= mStartFrame && frameNumber <= mEndFrame ) + if( frameNumber >= mStartFrame && frameNumber <= mEndFrame && mCurrentFrame != frameNumber ) { mCurrentFrame = frameNumber; mCurrentFrameUpdated = true; @@ -457,7 +454,7 @@ void VectorRasterizeThread::Rasterize() if( !resourceReady ) { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Resource ready trigger [%p]\n", this ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Resource ready trigger [current = %d] [%p]\n", currentFrame, this ); mResourceReadyTrigger->Trigger(); } @@ -471,7 +468,7 @@ void VectorRasterizeThread::Rasterize() // Animation is finished mAnimationFinishedTrigger->Trigger(); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Animation is finished [%p]\n", this ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Animation is finished [current = %d] [%p]\n", currentFrame, this ); } auto timeToSleepUntil = currentFrameStartTime + std::chrono::nanoseconds( mFrameDurationNanoSeconds ); -- 2.7.4