X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fvector-rasterize-thread.cpp;h=2c393335a7716e34464e6b61144b8cefa9412b72;hp=42ffe5a0583361cba7ee4ada1caf635c6e25c6eb;hb=52f294c7dc6b1bbd3265489a2d8f70659ed88931;hpb=9261436cbbc4ab26fd226b8ddf2dceb77468e0a1 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 42ffe5a..2c39333 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -44,12 +44,14 @@ constexpr auto NANOSECONDS_PER_SECOND( 1e+9 ); Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VECTOR_ANIMATION" ); #endif -inline void ResetToStart( bool& updated, uint32_t& value, uint32_t startValue, ConditionalWait& conditionalWait ) +template< typename T > +inline void ResetValue( bool& updated, T& value, T newValue, ConditionalWait& conditionalWait ) { ConditionalWait::ScopedLock lock( conditionalWait ); if( !updated ) { - value = startValue; + value = newValue; + updated = true; } } @@ -59,12 +61,11 @@ VectorRasterizeThread::VectorRasterizeThread( const std::string& url ) : mUrl( url ), mVectorRenderer(), mConditionalWait(), - mResourceReadyTrigger(), mAnimationFinishedTrigger(), - mPlayRange( 0.0f, 1.0f ), - mPlayState( DevelImageVisual::PlayState::STOPPED ), + mPlayState( PlayState::STOPPED ), + mStopBehavior( DevelImageVisual::StopBehavior::CURRENT_FRAME ), + mLoopingMode( DevelImageVisual::LoopingMode::RESTART ), mFrameDurationNanoSeconds( 0 ), - mProgress( 0.0f ), mFrameRate( 60.0f ), mCurrentFrame( 0 ), mTotalFrame( 0 ), @@ -78,6 +79,10 @@ VectorRasterizeThread::VectorRasterizeThread( const std::string& url ) mDestroyThread( false ), mResourceReady( false ), mCurrentFrameUpdated( false ), + mCurrentLoopUpdated( false ), + mForward( true ), + mUpdateFrameNumber( false ), + mNeedAnimationFinishedTrigger( true ), mLogFactory( Dali::Adaptor::Get().GetLogFactory() ) { Initialize(); @@ -90,12 +95,9 @@ 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\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::~VectorRasterizeThread: Join [%p]\n", this ); Join(); } @@ -109,6 +111,8 @@ void VectorRasterizeThread::Run() { Rasterize(); } + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Run: End of thread [%p]\n", this ); } void VectorRasterizeThread::SetRenderer( Renderer renderer ) @@ -117,7 +121,7 @@ void VectorRasterizeThread::SetRenderer( Renderer renderer ) mVectorRenderer.SetRenderer( renderer ); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetRenderer\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetRenderer [%p]\n", this ); } void VectorRasterizeThread::SetSize( uint32_t width, uint32_t height ) @@ -132,44 +136,47 @@ void VectorRasterizeThread::SetSize( uint32_t width, uint32_t height ) mResourceReady = false; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetSize: width = %d, height = %d\n", width, height ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetSize: width = %d, height = %d [%p]\n", width, height, this ); } } void VectorRasterizeThread::PlayAnimation() { ConditionalWait::ScopedLock lock( mConditionalWait ); - if( mPlayState != DevelImageVisual::PlayState::PLAYING ) + + if( mPlayState != PlayState::PLAYING ) { - mPlayState = DevelImageVisual::PlayState::PLAYING; + mNeedRender = true; + mUpdateFrameNumber = false; + mPlayState = PlayState::PLAYING; mConditionalWait.Notify( lock ); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::PlayAnimation: Start\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::PlayAnimation: Play [%p]\n", this ); } } void VectorRasterizeThread::StopAnimation() { ConditionalWait::ScopedLock lock( mConditionalWait ); - if( mPlayState != DevelImageVisual::PlayState::STOPPED ) + if( mPlayState != PlayState::STOPPED && mPlayState != PlayState::STOPPING ) { - mPlayState = DevelImageVisual::PlayState::STOPPED; - - mCurrentFrame = mStartFrame; - mCurrentFrameUpdated = true; + mNeedRender = true; + mNeedAnimationFinishedTrigger = false; + mPlayState = PlayState::STOPPING; + mConditionalWait.Notify( lock ); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::StopAnimation: Stop\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::StopAnimation: Stop [%p]\n", this ); } } void VectorRasterizeThread::PauseAnimation() { ConditionalWait::ScopedLock lock( mConditionalWait ); - if( mPlayState == DevelImageVisual::PlayState::PLAYING ) + if( mPlayState == PlayState::PLAYING ) { - mPlayState = DevelImageVisual::PlayState::PAUSED; + mPlayState = PlayState::PAUSED; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::PauseAnimation: Pause\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::PauseAnimation: Pause [%p]\n", this ); } } @@ -182,16 +189,10 @@ void VectorRasterizeThread::RenderFrame() mNeedRender = true; mConditionalWait.Notify( lock ); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::RenderFrame: Render\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::RenderFrame: Render [%p]\n", this ); } } -void VectorRasterizeThread::SetResourceReadyCallback( EventThreadCallback* callback ) -{ - ConditionalWait::ScopedLock lock( mConditionalWait ); - mResourceReadyTrigger = std::unique_ptr< EventThreadCallback >( callback ); -} - void VectorRasterizeThread::SetAnimationFinishedCallback( EventThreadCallback* callback ) { ConditionalWait::ScopedLock lock( mConditionalWait ); @@ -205,34 +206,32 @@ void VectorRasterizeThread::SetLoopCount( int32_t count ) ConditionalWait::ScopedLock lock( mConditionalWait ); mLoopCount = count; - } -} + mCurrentLoop = 0; + mCurrentLoopUpdated = true; -int32_t VectorRasterizeThread::GetLoopCount() const -{ - return mLoopCount; + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetLoopCount: [%d] [%p]\n", count, this ); + } } -void VectorRasterizeThread::SetPlayRange( Vector2 range ) +void VectorRasterizeThread::SetPlayRange( uint32_t startFrame, uint32_t endFrame ) { - // Make sure the range specified is between 0.0 and 1.0 - if( range.x >= 0.0f && range.x <= 1.0f && range.y >= 0.0f && range.y <= 1.0f ) + // Make sure the range specified is between 0 and the total frame number + if( ( startFrame < mTotalFrame ) && ( endFrame < mTotalFrame ) ) { - Vector2 orderedRange( range ); // If the range is not in order swap values - if( range.x > range.y ) + if( startFrame > endFrame ) { - orderedRange = Vector2( range.y, range.x ); + uint32_t temp = startFrame; + startFrame = endFrame; + endFrame = temp; } - if( mPlayRange != orderedRange ) + if( startFrame != mStartFrame || endFrame != mEndFrame ) { ConditionalWait::ScopedLock lock( mConditionalWait ); - mPlayRange = orderedRange; - - mStartFrame = static_cast< uint32_t >( mPlayRange.x * mTotalFrame + 0.5f ); - mEndFrame = static_cast< uint32_t >( mPlayRange.y * mTotalFrame + 0.5f ); + mStartFrame = startFrame; + mEndFrame = endFrame; // If the current frame is out of the range, change the current frame also. if( mStartFrame > mCurrentFrame ) @@ -249,35 +248,77 @@ void VectorRasterizeThread::SetPlayRange( Vector2 range ) mCurrentFrameUpdated = true; mResourceReady = false; } + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetPlayRange: [%d, %d] [%p]\n", mStartFrame, mEndFrame, this ); + } + } +} + +DevelImageVisual::PlayState::Type VectorRasterizeThread::GetPlayState() const +{ + DevelImageVisual::PlayState::Type state = DevelImageVisual::PlayState::STOPPED; + + switch( mPlayState ) + { + case PlayState::PLAYING: + { + state = DevelImageVisual::PlayState::PLAYING; + break; + } + case PlayState::PAUSED: + { + state = DevelImageVisual::PlayState::PAUSED; + break; + } + case PlayState::STOPPING: + case PlayState::STOPPED: + { + state = DevelImageVisual::PlayState::STOPPED; + break; } } + + return state; } -Vector2 VectorRasterizeThread::GetPlayRange() const +bool VectorRasterizeThread::IsResourceReady() const { - return mPlayRange; + return mResourceReady; } -void VectorRasterizeThread::SetCurrentProgress( float progress ) +void VectorRasterizeThread::SetCurrentFrameNumber( uint32_t frameNumber ) { ConditionalWait::ScopedLock lock( mConditionalWait ); - if( progress >= mPlayRange.x && progress <= mPlayRange.y ) + if( mCurrentFrame == frameNumber ) { - mProgress = progress; + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetCurrentFrameNumber: Set same frame [%d] [%p]\n", frameNumber, this ); + return; + } - mCurrentFrame = static_cast< uint32_t >( mTotalFrame * progress + 0.5f ); + if( frameNumber >= mStartFrame && frameNumber <= mEndFrame ) + { + mCurrentFrame = frameNumber; mCurrentFrameUpdated = true; mResourceReady = false; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetCurrentProgress: progress = %f (%d)\n", progress, mCurrentFrame ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetCurrentFrameNumber: frame number = %d [%p]\n", mCurrentFrame, this ); + } + else + { + DALI_LOG_ERROR( "Invalid frame number [%d (%d, %d)]\n", frameNumber, mStartFrame, mEndFrame ); } } -float VectorRasterizeThread::GetCurrentProgress() const +uint32_t VectorRasterizeThread::GetCurrentFrameNumber() const { - return ( static_cast< float >( mCurrentFrame ) / static_cast< float >( mTotalFrame ) ); + return mCurrentFrame; +} + +uint32_t VectorRasterizeThread::GetTotalFrameNumber() const +{ + return mTotalFrame; } void VectorRasterizeThread::GetDefaultSize( uint32_t& width, uint32_t& height ) const @@ -285,14 +326,25 @@ void VectorRasterizeThread::GetDefaultSize( uint32_t& width, uint32_t& height ) mVectorRenderer.GetDefaultSize( width, height ); } -DevelImageVisual::PlayState VectorRasterizeThread::GetPlayState() const +void VectorRasterizeThread::SetStopBehavior( DevelImageVisual::StopBehavior::Type stopBehavior ) { - return mPlayState; + ConditionalWait::ScopedLock lock( mConditionalWait ); + mStopBehavior = stopBehavior; + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetStopBehavior: stop behavor = %d [%p]\n", mStopBehavior, this ); } -bool VectorRasterizeThread::IsResourceReady() const +void VectorRasterizeThread::SetLoopingMode( DevelImageVisual::LoopingMode::Type loopingMode ) { - return mResourceReady; + ConditionalWait::ScopedLock lock( mConditionalWait ); + mLoopingMode = loopingMode; + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetLoopingMode: looping mode = %d [%p]\n", mLoopingMode, this ); +} + +VectorRasterizeThread::UploadCompletedSignalType& VectorRasterizeThread::UploadCompletedSignal() +{ + return mVectorRenderer.UploadCompletedSignal(); } void VectorRasterizeThread::Initialize() @@ -301,90 +353,133 @@ void VectorRasterizeThread::Initialize() mTotalFrame = mVectorRenderer.GetTotalFrameNumber(); - mStartFrame = static_cast< uint32_t >( mPlayRange.x * mTotalFrame + 0.5f ); - mEndFrame = static_cast< uint32_t >( mPlayRange.y * mTotalFrame + 0.5f ); - - mCurrentFrame = std::max( static_cast< uint32_t >( mTotalFrame * mProgress + 0.5f ), mStartFrame ); + mEndFrame = mTotalFrame - 1; mFrameRate = mVectorRenderer.GetFrameRate(); mFrameDurationNanoSeconds = NANOSECONDS_PER_SECOND / mFrameRate; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Initialize: file = %s [%d frames, %f fps]\n", mUrl.c_str(), mTotalFrame, mFrameRate ); + uint32_t width, height; + mVectorRenderer.GetDefaultSize( width, height ); + + SetSize( width, height ); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Initialize: file = %s [%d frames, %f fps] [%p]\n", mUrl.c_str(), mTotalFrame, mFrameRate, this ); } void VectorRasterizeThread::Rasterize() { - bool resourceReady; + bool stopped = false, needAnimationFinishedTrigger; uint32_t currentFrame, startFrame, endFrame; - int32_t loopCount; - DevelImageVisual::PlayState playState; + int32_t loopCount, currentLoopCount; { ConditionalWait::ScopedLock lock( mConditionalWait ); - if( mPlayState != DevelImageVisual::PlayState::PLAYING && !mNeedRender && !mDestroyThread ) + if( ( mPlayState == PlayState::PAUSED || mPlayState == PlayState::STOPPED ) && !mNeedRender && !mDestroyThread ) { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Wait\n" ); - - if( mPlayState == DevelImageVisual::PlayState::STOPPED ) - { - // Reset the current loop - mCurrentLoop = 0; - } + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Wait [%p]\n", this ); mConditionalWait.Wait( lock ); } - resourceReady = mResourceReady; - currentFrame = mCurrentFrame++; + if( mPlayState == PlayState::PLAYING && mUpdateFrameNumber ) + { + mCurrentFrame = mForward ? mCurrentFrame + 1 : mCurrentFrame - 1; + } + + currentFrame = mCurrentFrame; startFrame = mStartFrame; endFrame = mEndFrame; loopCount = mLoopCount; - playState = mPlayState; + currentLoopCount = mCurrentLoop; + needAnimationFinishedTrigger = mNeedAnimationFinishedTrigger; - mNeedRender = false; mResourceReady = true; + mNeedRender = false; mCurrentFrameUpdated = false; + mCurrentLoopUpdated = false; + mUpdateFrameNumber = true; + mNeedAnimationFinishedTrigger = true; } auto currentFrameStartTime = std::chrono::system_clock::now(); - // Rasterize - mVectorRenderer.Render( currentFrame ); + if( mPlayState == PlayState::STOPPING ) + { + currentFrame = GetStoppedFrame( startFrame, endFrame, currentFrame ); + ResetValue( mCurrentFrameUpdated, mCurrentFrame, currentFrame, mConditionalWait ); - if( playState == DevelImageVisual::PlayState::PLAYING ) + stopped = true; + } + else if( mPlayState == PlayState::PLAYING ) { - if( currentFrame >= endFrame ) + bool animationFinished = false; + + if( currentFrame >= endFrame ) // last frame { - if( loopCount < 0 ) + if( mLoopingMode == DevelImageVisual::LoopingMode::AUTO_REVERSE ) { - // repeat forever - ResetToStart( mCurrentFrameUpdated, mCurrentFrame, startFrame, mConditionalWait ); // If the current frame is changed in the event thread, don't overwrite it. + mForward = false; } else { - mCurrentLoop++; - if( mCurrentLoop >= loopCount ) + if( loopCount < 0 || ++currentLoopCount < loopCount ) // repeat forever or before the last loop { - mPlayState = DevelImageVisual::PlayState::STOPPED; - - // Animation is finished - mAnimationFinishedTrigger->Trigger(); - - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Animation is finished\n" ); + ResetValue( mCurrentFrameUpdated, mCurrentFrame, startFrame, mConditionalWait ); // If the current frame is changed in the event thread, don't overwrite it. + mUpdateFrameNumber = false; } else { - ResetToStart( mCurrentFrameUpdated, mCurrentFrame, startFrame, mConditionalWait ); + animationFinished = true; // end of animation } + ResetValue( mCurrentLoopUpdated, mCurrentLoop, currentLoopCount, mConditionalWait ); + } + } + else if( currentFrame == startFrame && !mForward ) // first frame + { + if( loopCount < 0 || ++currentLoopCount < loopCount ) // repeat forever or before the last loop + { + mForward = true; + } + else + { + animationFinished = true; // end of animation + } + ResetValue( mCurrentLoopUpdated, mCurrentLoop, currentLoopCount, mConditionalWait ); + } + + if( animationFinished ) + { + if( mStopBehavior == DevelImageVisual::StopBehavior::CURRENT_FRAME ) + { + stopped = true; + } + else + { + mPlayState = PlayState::STOPPING; } } } - if( !resourceReady ) + // Rasterize + if( !mVectorRenderer.Render( currentFrame ) ) { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Resource ready trigger\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Rendering failed. Try again later.[%d] [%p]\n", currentFrame, this ); + mUpdateFrameNumber = false; + } - mResourceReadyTrigger->Trigger(); + if( stopped ) + { + mPlayState = PlayState::STOPPED; + mForward = true; + mCurrentLoop = 0; + + // Animation is finished + if( needAnimationFinishedTrigger ) + { + mAnimationFinishedTrigger->Trigger(); + } + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Animation is finished [current = %d] [%p]\n", currentFrame, this ); } auto timeToSleepUntil = currentFrameStartTime + std::chrono::nanoseconds( mFrameDurationNanoSeconds ); @@ -392,12 +487,45 @@ void VectorRasterizeThread::Rasterize() #if defined(DEBUG_ENABLED) auto sleepDuration = std::chrono::duration_cast< std::chrono::milliseconds >( timeToSleepUntil - std::chrono::system_clock::now() ); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: [current = %d, sleep duration = %lld]\n", mCurrentFrame, sleepDuration.count() ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: [current = %d, sleep duration = %lld] [%p]\n", currentFrame, sleepDuration.count(), this ); #endif std::this_thread::sleep_until( timeToSleepUntil ); } +uint32_t VectorRasterizeThread::GetStoppedFrame( uint32_t startFrame, uint32_t endFrame, uint32_t currentFrame ) +{ + uint32_t frame = currentFrame; + + switch( mStopBehavior ) + { + case DevelImageVisual::StopBehavior::FIRST_FRAME: + { + frame = startFrame; + break; + } + case DevelImageVisual::StopBehavior::LAST_FRAME: + { + if( mLoopingMode == DevelImageVisual::LoopingMode::AUTO_REVERSE ) + { + frame = startFrame; + } + else + { + frame = endFrame; + } + break; + } + case DevelImageVisual::StopBehavior::CURRENT_FRAME: + { + frame = currentFrame; + break; + } + } + + return frame; +} + } // namespace Internal } // namespace Toolkit