/*
- * 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.
namespace
{
-constexpr auto LOOP_FOREVER = -1;
-constexpr auto NANOSECONDS_PER_SECOND( 1e+9 );
-
#if defined(DEBUG_ENABLED)
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 )
-{
- ConditionalWait::ScopedLock lock( conditionalWait );
- if( !updated )
- {
- value = startValue;
- }
-}
-
} // unnamed namespace
-VectorRasterizeThread::VectorRasterizeThread( const std::string& url )
-: mUrl( url ),
- mVectorRenderer(),
+VectorRasterizeThread::VectorRasterizeThread()
+: mRasterizeTasks(),
mConditionalWait(),
- mResourceReadyTrigger(),
- mAnimationFinishedTrigger(),
- mPlayState( DevelImageVisual::PlayState::STOPPED ),
- mFrameDurationNanoSeconds( 0 ),
- mFrameRate( 60.0f ),
- mCurrentFrame( 0 ),
- mTotalFrame( 0 ),
- mStartFrame( 0 ),
- mEndFrame( 0 ),
- mWidth( 0 ),
- mHeight( 0 ),
- mLoopCount( LOOP_FOREVER ),
- mCurrentLoop( 0 ),
- mNeedRender( false ),
+ mCompletedCallback(),
mDestroyThread( false ),
- mResourceReady( false ),
- mCurrentFrameUpdated( false ),
+ mIsThreadStarted( false ),
mLogFactory( Dali::Adaptor::Get().GetLogFactory() )
{
- Initialize();
}
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();
}
-void VectorRasterizeThread::Run()
-{
- SetThreadName( "VectorImageThread" );
- mLogFactory.InstallLogFunction();
-
- while( !mDestroyThread )
- {
- Rasterize();
- }
-
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Run: End of thread\n" );
-}
-
-void VectorRasterizeThread::SetRenderer( Renderer renderer )
+void VectorRasterizeThread::SetCompletedCallback( CallbackBase* callback )
{
ConditionalWait::ScopedLock lock( mConditionalWait );
- mVectorRenderer.SetRenderer( renderer );
-
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetRenderer\n" );
-}
-
-void VectorRasterizeThread::SetSize( uint32_t width, uint32_t height )
-{
- if( mWidth != width || mHeight != height )
- {
- ConditionalWait::ScopedLock lock( mConditionalWait );
- mVectorRenderer.SetSize( width, height );
-
- mWidth = width;
- mHeight = height;
-
- mResourceReady = false;
-
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetSize: width = %d, height = %d\n", width, height );
- }
+ mCompletedCallback = std::unique_ptr< CallbackBase >( callback );
}
-void VectorRasterizeThread::PlayAnimation()
+void VectorRasterizeThread::AddTask( VectorAnimationTaskPtr task )
{
- ConditionalWait::ScopedLock lock( mConditionalWait );
-
- if( mPlayState != DevelImageVisual::PlayState::PLAYING )
+ if( !mIsThreadStarted )
{
- mPlayState = DevelImageVisual::PlayState::PLAYING;
- mConditionalWait.Notify( lock );
-
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::PlayAnimation: Start\n" );
+ Start();
+ mIsThreadStarted = true;
}
-}
-void VectorRasterizeThread::StopAnimation()
-{
+ // Lock while adding task to the queue
ConditionalWait::ScopedLock lock( mConditionalWait );
- if( mPlayState != DevelImageVisual::PlayState::STOPPED )
- {
- mPlayState = DevelImageVisual::PlayState::STOPPED;
-
- mCurrentFrame = mStartFrame;
- mCurrentFrameUpdated = true;
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::StopAnimation: Stop\n" );
- }
-}
-
-void VectorRasterizeThread::PauseAnimation()
-{
- ConditionalWait::ScopedLock lock( mConditionalWait );
- if( mPlayState == DevelImageVisual::PlayState::PLAYING )
+ if( mRasterizeTasks.end() == std::find( mRasterizeTasks.begin(), mRasterizeTasks.end(), task ) )
{
- mPlayState = DevelImageVisual::PlayState::PAUSED;
+ mRasterizeTasks.push_back( task );
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::PauseAnimation: Pause\n" );
- }
-}
-
-void VectorRasterizeThread::RenderFrame()
-{
- ConditionalWait::ScopedLock lock( mConditionalWait );
-
- if( !mResourceReady )
- {
- mNeedRender = true;
+ // wake up the animation thread
mConditionalWait.Notify( lock );
-
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::RenderFrame: Render\n" );
- }
-}
-
-void VectorRasterizeThread::SetResourceReadyCallback( EventThreadCallback* callback )
-{
- ConditionalWait::ScopedLock lock( mConditionalWait );
- mResourceReadyTrigger = std::unique_ptr< EventThreadCallback >( callback );
-}
-
-void VectorRasterizeThread::SetAnimationFinishedCallback( EventThreadCallback* callback )
-{
- ConditionalWait::ScopedLock lock( mConditionalWait );
- mAnimationFinishedTrigger = std::unique_ptr< EventThreadCallback >( callback );
-}
-
-void VectorRasterizeThread::SetLoopCount( int32_t count )
-{
- if( mLoopCount != count )
- {
- ConditionalWait::ScopedLock lock( mConditionalWait );
-
- mLoopCount = count;
-
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetLoopCount: [%d]\n", count );
- }
-}
-
-void VectorRasterizeThread::SetPlayRange( uint32_t startFrame, uint32_t endFrame )
-{
- // Make sure the range specified is between 0 and the total frame number
- if( startFrame >= 0 && startFrame < mTotalFrame && endFrame >= 0 && endFrame < mTotalFrame )
- {
- // If the range is not in order swap values
- if( startFrame > endFrame )
- {
- uint32_t temp = startFrame;
- startFrame = endFrame;
- endFrame = temp;
- }
-
- if( startFrame != mStartFrame || endFrame != mEndFrame )
- {
- ConditionalWait::ScopedLock lock( mConditionalWait );
-
- mStartFrame = startFrame;
- mEndFrame = endFrame;
-
- // If the current frame is out of the range, change the current frame also.
- if( mStartFrame > mCurrentFrame )
- {
- mCurrentFrame = mStartFrame;
-
- mCurrentFrameUpdated = true;
- mResourceReady = false;
- }
- else if( mEndFrame < mCurrentFrame )
- {
- mCurrentFrame = mEndFrame;
-
- mCurrentFrameUpdated = true;
- mResourceReady = false;
- }
-
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetPlayRangeInFrame: [%d, %d]\n", mStartFrame, mEndFrame );
- }
}
}
-void VectorRasterizeThread::SetCurrentFrameNumber( uint32_t frameNumber )
+void VectorRasterizeThread::Run()
{
- ConditionalWait::ScopedLock lock( mConditionalWait );
-
- if( frameNumber >= mStartFrame && frameNumber <= mEndFrame )
- {
- mCurrentFrame = frameNumber;
- mCurrentFrameUpdated = true;
-
- mResourceReady = false;
+ SetThreadName( "VectorRasterizeThread" );
+ mLogFactory.InstallLogFunction();
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetCurrentFrameNumber: frame number = %f (%d)\n", mCurrentFrame );
- }
- else
+ while( !mDestroyThread )
{
- DALI_LOG_ERROR( "Invalid frame number [%d (%d, %d)]\n", frameNumber, mStartFrame, mEndFrame );
+ Rasterize();
}
}
-uint32_t VectorRasterizeThread::GetCurrentFrameNumber() const
-{
- return mCurrentFrame;
-}
-
-uint32_t VectorRasterizeThread::GetTotalFrameNumber() const
-{
- return mTotalFrame;
-}
-
-void VectorRasterizeThread::GetDefaultSize( uint32_t& width, uint32_t& height ) const
-{
- mVectorRenderer.GetDefaultSize( width, height );
-}
-
-DevelImageVisual::PlayState VectorRasterizeThread::GetPlayState() const
-{
- return mPlayState;
-}
-
-bool VectorRasterizeThread::IsResourceReady() const
-{
- return mResourceReady;
-}
-
-void VectorRasterizeThread::Initialize()
-{
- mVectorRenderer = VectorAnimationRenderer::New( mUrl );
-
- mTotalFrame = mVectorRenderer.GetTotalFrameNumber();
-
- mEndFrame = mTotalFrame;
-
- mFrameRate = mVectorRenderer.GetFrameRate();
- mFrameDurationNanoSeconds = NANOSECONDS_PER_SECOND / 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]\n", mUrl.c_str(), mTotalFrame, mFrameRate );
-}
-
void VectorRasterizeThread::Rasterize()
{
- bool resourceReady;
- uint32_t currentFrame, startFrame, endFrame;
- int32_t loopCount;
- DevelImageVisual::PlayState playState;
-
+ VectorAnimationTaskPtr nextTask;
{
+ // Lock while popping task out from the queue
ConditionalWait::ScopedLock lock( mConditionalWait );
- if( mPlayState != DevelImageVisual::PlayState::PLAYING && !mNeedRender && !mDestroyThread )
+ // conditional wait
+ if( mRasterizeTasks.empty() )
{
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Wait\n" );
-
- if( mPlayState == DevelImageVisual::PlayState::STOPPED )
- {
- // Reset the current loop
- mCurrentLoop = 0;
- }
mConditionalWait.Wait( lock );
}
- resourceReady = mResourceReady;
- currentFrame = mCurrentFrame++;
- startFrame = mStartFrame;
- endFrame = mEndFrame;
- loopCount = mLoopCount;
- playState = mPlayState;
-
- mNeedRender = false;
- mResourceReady = true;
- mCurrentFrameUpdated = false;
- }
-
- auto currentFrameStartTime = std::chrono::system_clock::now();
-
- // Rasterize
- mVectorRenderer.Render( currentFrame );
-
- if( playState == DevelImageVisual::PlayState::PLAYING )
- {
- if( currentFrame >= endFrame )
+ // pop out the next task from the queue
+ if( !mRasterizeTasks.empty() )
{
- if( loopCount < 0 )
- {
- // repeat forever
- ResetToStart( mCurrentFrameUpdated, mCurrentFrame, startFrame, mConditionalWait ); // If the current frame is changed in the event thread, don't overwrite it.
- }
- else
- {
- mCurrentLoop++;
- if( mCurrentLoop >= loopCount )
- {
- mPlayState = DevelImageVisual::PlayState::STOPPED;
-
- ResetToStart( mCurrentFrameUpdated, mCurrentFrame, startFrame, mConditionalWait );
-
- // Animation is finished
- mAnimationFinishedTrigger->Trigger();
-
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Animation is finished\n" );
- }
- else
- {
- ResetToStart( mCurrentFrameUpdated, mCurrentFrame, startFrame, mConditionalWait );
- }
- }
+ std::vector< VectorAnimationTaskPtr >::iterator next = mRasterizeTasks.begin();
+ nextTask = *next;
+ mRasterizeTasks.erase( next );
}
}
- if( !resourceReady )
+ if( nextTask )
{
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Resource ready trigger\n" );
+ bool keepAnimation = nextTask->Rasterize();
- mResourceReadyTrigger->Trigger();
+ if( mCompletedCallback )
+ {
+ CallbackBase::Execute( *mCompletedCallback, nextTask, keepAnimation );
+ }
}
-
- auto timeToSleepUntil = currentFrameStartTime + std::chrono::nanoseconds( mFrameDurationNanoSeconds );
-
-#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", currentFrame, sleepDuration.count() );
-#endif
-
- std::this_thread::sleep_until( timeToSleepUntil );
}
} // namespace Internal
projects / platform / core / uifw / dali-toolkit.git / blobdiff