DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::~VectorAnimationTask: destructor [%p]\n", this );
}
+void VectorAnimationTask::Finalize()
+{
+ // Release some objects in the main thread
+ if( mAnimationFinishedTrigger )
+ {
+ mAnimationFinishedTrigger.reset();
+ }
+
+ mVectorRenderer.Finalize();
+}
+
void VectorAnimationTask::SetRenderer( Renderer renderer )
{
ConditionalWait::ScopedLock lock( mConditionalWait );
void VectorAnimationTask::SetAnimationFinishedCallback( EventThreadCallback* callback )
{
ConditionalWait::ScopedLock lock( mConditionalWait );
- mAnimationFinishedTrigger = std::unique_ptr< EventThreadCallback >( callback );
+ if( callback )
+ {
+ mAnimationFinishedTrigger = std::unique_ptr< EventThreadCallback >( callback );
+ }
}
void VectorAnimationTask::SetLoopCount( int32_t count )
mCurrentFrame = frameNumber;
mCurrentFrameUpdated = true;
+ mUpdateFrameNumber = false;
mResourceReady = false;
DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetCurrentFrameNumber: frame number = %d [%p]\n", mCurrentFrame, this );
DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetLoopingMode: looping mode = %d [%p]\n", mLoopingMode, this );
}
+void VectorAnimationTask::GetLayerInfo( Property::Map& map ) const
+{
+ mVectorRenderer.GetLayerInfo( map );
+}
+
VectorAnimationTask::UploadCompletedSignalType& VectorAnimationTask::UploadCompletedSignal()
{
return mVectorRenderer.UploadCompletedSignal();
}
// Rasterize
- bool renderSuccess = mVectorRenderer.Render( currentFrame );
- if( !renderSuccess )
+ bool renderSuccess = false;
+ if( mVectorRenderer )
{
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::Rasterize: Rendering failed. Try again later.[%d] [%p]\n", currentFrame, this );
- mUpdateFrameNumber = false;
+ renderSuccess = mVectorRenderer.Render( currentFrame );
+ if( !renderSuccess )
+ {
+ DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::Rasterize: Rendering failed. Try again later.[%d] [%p]\n", currentFrame, this );
+ mUpdateFrameNumber = false;
+ }
}
if( stopped && renderSuccess )
std::chrono::time_point< std::chrono::system_clock > VectorAnimationTask::CalculateNextFrameTime( bool renderNow )
{
- mNextFrameStartTime = mNextFrameStartTime + std::chrono::nanoseconds( mFrameDurationNanoSeconds );
+ // std::chrono::time_point template has second parameter duration which defaults to the std::chrono::system_clock supported
+ // duration. In some C++11 implementations it is a milliseconds duration, so it fails to compile unless mNextFrameStartTime
+ // is casted to use the default duration.
+ mNextFrameStartTime = std::chrono::time_point_cast< std::chrono::time_point< std::chrono::system_clock >::duration >(
+ mNextFrameStartTime + std::chrono::nanoseconds( mFrameDurationNanoSeconds ) );
auto current = std::chrono::system_clock::now();
if( renderNow || mNextFrameStartTime < current )
{