summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6373497)
Change-Id: Iaa35523eecde1d22a1d2bdcd9ae07dc1e66ee58b
- uint32_t GetTotalFrameNumber()
+ uint32_t GetTotalFrameNumber() const
+ float GetFrameRate() const
+ {
+ return 60.0f;
+ }
+
public:
std::string mUrl;
public:
std::string mUrl;
Internal::Adaptor::GetImplementation( *this ).Render( frameNumber );
}
Internal::Adaptor::GetImplementation( *this ).Render( frameNumber );
}
-uint32_t VectorAnimationRenderer::GetTotalFrameNumber()
+uint32_t VectorAnimationRenderer::GetTotalFrameNumber() const
{
return Internal::Adaptor::GetImplementation( *this ).GetTotalFrameNumber();
}
{
return Internal::Adaptor::GetImplementation( *this ).GetTotalFrameNumber();
}
+float VectorAnimationRenderer::GetFrameRate() const
+{
+ return Internal::Adaptor::GetImplementation( *this ).GetFrameRate();
+}
+
{
case DevelAnimatedVectorImageVisual::Action::PLAY:
{
{
case DevelAnimatedVectorImageVisual::Action::PLAY:
{
+ if( IsOnStage() && mVisualSize != Vector2::ZERO )
{
mVectorRasterizeThread.PlayAnimation();
{
mVectorRasterizeThread.PlayAnimation();
#include <dali/devel-api/adaptor-framework/thread-settings.h>
#include <dali/integration-api/adaptors/adaptor.h>
#include <dali/integration-api/debug.h>
#include <dali/devel-api/adaptor-framework/thread-settings.h>
#include <dali/integration-api/adaptors/adaptor.h>
#include <dali/integration-api/debug.h>
+#include <chrono>
+#include <thread>
{
constexpr auto LOOP_FOREVER = -1;
{
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" );
#if defined(DEBUG_ENABLED)
Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VECTOR_ANIMATION" );
mAnimationFinishedTrigger(),
mPlayRange( 0.0f, 1.0f ),
mPlayState( DevelImageVisual::PlayState::STOPPED ),
mAnimationFinishedTrigger(),
mPlayRange( 0.0f, 1.0f ),
mPlayState( DevelImageVisual::PlayState::STOPPED ),
+ mFrameDurationNanoSeconds( 0 ),
mCurrentFrame( 0 ),
mTotalFrame( 0 ),
mStartFrame( 0 ),
mCurrentFrame( 0 ),
mTotalFrame( 0 ),
mStartFrame( 0 ),
mCurrentFrame = std::max( static_cast< uint32_t >( mTotalFrame * mProgress + 0.5f ), mStartFrame );
mCurrentFrame = std::max( static_cast< uint32_t >( mTotalFrame * mProgress + 0.5f ), mStartFrame );
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::StartRender: Renderer is started [%d (%d, %d)]\n", mTotalFrame, mStartFrame, mEndFrame );
+ mFrameRate = mVectorRenderer.GetFrameRate();
+ mFrameDurationNanoSeconds = NANOSECONDS_PER_SECOND / mFrameRate;
+
+ DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::StartRender: Renderer is started [%d, %f fps]\n", mTotalFrame, mFrameRate );
return true;
}
void VectorRasterizeThread::Rasterize()
{
return true;
}
void VectorRasterizeThread::Rasterize()
{
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: [%d]\n", mCurrentFrame );
-
bool needRender, resourceReady;
{
bool needRender, resourceReady;
{
resourceReady = mResourceReady;
}
resourceReady = mResourceReady;
}
+ auto currentFrameStartTime = std::chrono::system_clock::now();
+
// Rasterize
mVectorRenderer.Render( mCurrentFrame );
// Rasterize
mVectorRenderer.Render( mCurrentFrame );
mResourceReadyTrigger->Trigger();
mResourceReady = true;
}
mResourceReadyTrigger->Trigger();
mResourceReady = true;
}
+
+ 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", mCurrentFrame, sleepDuration.count() );
+#endif
+
+ std::this_thread::sleep_until( timeToSleepUntil );
}
} // namespace Internal
}
} // namespace Internal
std::unique_ptr< EventThreadCallback > mAnimationFinishedTrigger;
Vector2 mPlayRange;
DevelImageVisual::PlayState mPlayState;
std::unique_ptr< EventThreadCallback > mAnimationFinishedTrigger;
Vector2 mPlayRange;
DevelImageVisual::PlayState mPlayState;
+ int64_t mFrameDurationNanoSeconds;
uint32_t mCurrentFrame;
uint32_t mTotalFrame;
uint32_t mStartFrame;
uint32_t mCurrentFrame;
uint32_t mTotalFrame;
uint32_t mStartFrame;