From af8eb8d7c507d99a03155c2070a748dfc094833a Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 31 Jul 2019 11:19:23 +0900 Subject: [PATCH] (Vector) Check failure of vector rendering Change-Id: Ie5423ae341e207168d46ca8e90c4c68c4fbf0e14 --- .../toolkit-vector-animation-renderer.cpp | 20 ++++++++--- .../internal/controls/image-view/image-view-impl.h | 2 +- .../animated-vector-image-visual.cpp | 12 +++++-- .../vector-rasterize-thread.cpp | 42 ++++++++++++---------- 4 files changed, 49 insertions(+), 27 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 fbc24bf..8e856bb 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 @@ -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. @@ -36,7 +36,8 @@ public: : mUrl( url ), mRenderer(), mWidth( 0 ), - mHeight( 0 ) + mHeight( 0 ), + mPreviousFrame( 0 ) { } @@ -69,8 +70,16 @@ public: { } - void Render( uint32_t frameNumber ) + bool Render( uint32_t frameNumber ) { + if( frameNumber == 1 && mPreviousFrame != frameNumber ) + { + mPreviousFrame = frameNumber; + // For test corverage + return false; + } + mPreviousFrame = frameNumber; + return true; } uint32_t GetTotalFrameNumber() const @@ -95,6 +104,7 @@ public: Dali::Renderer mRenderer; uint32_t mWidth; uint32_t mHeight; + uint32_t mPreviousFrame; }; inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer ) @@ -166,9 +176,9 @@ void VectorAnimationRenderer::StopRender() Internal::Adaptor::GetImplementation( *this ).StopRender(); } -void VectorAnimationRenderer::Render( uint32_t frameNumber ) +bool VectorAnimationRenderer::Render( uint32_t frameNumber ) { - Internal::Adaptor::GetImplementation( *this ).Render( frameNumber ); + return Internal::Adaptor::GetImplementation( *this ).Render( frameNumber ); } uint32_t VectorAnimationRenderer::GetTotalFrameNumber() const diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h index 334754b..fe1bac1 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -90,7 +90,7 @@ public: /** * @brief Query whether alpha is pre-multiplied. * - * @return True is alpha is pre-multiplied, false otherwise. + * @return True if alpha is pre-multiplied, false otherwise. */ bool IsPreMultipliedAlphaEnabled() const; diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp index c70c37b..8939729 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.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. @@ -296,6 +296,8 @@ void AnimatedVectorImageVisual::DoSetOnStage( Actor& actor ) mPlacementActor = actor; mVectorRasterizeThread.SetRenderer( mImpl->mRenderer ); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnStage [%p]\n", this ); } void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) @@ -316,6 +318,8 @@ void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) // Reset the visual size to zero so that when adding the actor back to stage the rasterization is forced mVisualSize = Vector2::ZERO; + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOffStage [%p]\n", this ); } void AnimatedVectorImageVisual::OnSetTransform() @@ -324,7 +328,7 @@ void AnimatedVectorImageVisual::OnSetTransform() if( IsOnStage() ) { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f\n", visualSize.width, visualSize.height ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f [%p]\n", visualSize.width, visualSize.height, this ); if( visualSize != mVisualSize ) { @@ -357,6 +361,8 @@ void AnimatedVectorImageVisual::OnSetTransform() { actor.AddRenderer( mImpl->mRenderer ); mPlacementActor.Reset(); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: Renderer is added [%p]\n", this ); } ResourceReady( Toolkit::Visual::ResourceStatus::READY ); @@ -443,6 +449,8 @@ void AnimatedVectorImageVisual::OnResourceReady() mPlacementActor.Reset(); ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnResourceReady: Renderer is added [%p]\n", this ); } } 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 70a3302..fead5de 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 @@ -98,7 +98,7 @@ VectorRasterizeThread::~VectorRasterizeThread() 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(); } @@ -113,7 +113,7 @@ void VectorRasterizeThread::Run() Rasterize(); } - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Run: End of thread\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Run: End of thread [%p]\n", this ); } void VectorRasterizeThread::SetRenderer( Renderer renderer ) @@ -122,7 +122,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 ) @@ -137,7 +137,7 @@ 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 ); } } @@ -152,7 +152,7 @@ void VectorRasterizeThread::PlayAnimation() mPlayState = PlayState::PLAYING; mConditionalWait.Notify( lock ); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::PlayAnimation: Play\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::PlayAnimation: Play [%p]\n", this ); } } @@ -165,7 +165,7 @@ void VectorRasterizeThread::StopAnimation() 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 ); } } @@ -176,7 +176,7 @@ void VectorRasterizeThread::PauseAnimation() { 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 ); } } @@ -189,7 +189,7 @@ 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 ); } } @@ -213,7 +213,7 @@ void VectorRasterizeThread::SetLoopCount( int32_t count ) mLoopCount = count; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetLoopCount: [%d]\n", count ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetLoopCount: [%d] [%p]\n", count, this ); } } @@ -253,7 +253,7 @@ void VectorRasterizeThread::SetPlayRange( uint32_t startFrame, uint32_t endFrame mResourceReady = false; } - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetPlayRangeInFrame: [%d, %d]\n", mStartFrame, mEndFrame ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetPlayRange: [%d, %d] [%p]\n", mStartFrame, mEndFrame, this ); } } } @@ -301,7 +301,7 @@ void VectorRasterizeThread::SetCurrentFrameNumber( uint32_t frameNumber ) mResourceReady = false; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetCurrentFrameNumber: frame number = %d\n", mCurrentFrame ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetCurrentFrameNumber: frame number = %d [%p]\n", mCurrentFrame, this ); } else { @@ -329,7 +329,7 @@ void VectorRasterizeThread::SetStopBehavior( DevelImageVisual::StopBehavior::Typ ConditionalWait::ScopedLock lock( mConditionalWait ); mStopBehavior = stopBehavior; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetStopBehavior: stop behavor = %d\n", mStopBehavior ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetStopBehavior: stop behavor = %d [%p]\n", mStopBehavior, this ); } void VectorRasterizeThread::SetLoopingMode( DevelImageVisual::LoopingMode::Type loopingMode ) @@ -337,7 +337,7 @@ void VectorRasterizeThread::SetLoopingMode( DevelImageVisual::LoopingMode::Type ConditionalWait::ScopedLock lock( mConditionalWait ); mLoopingMode = loopingMode; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetLoopingMode: looping mode = %d\n", mLoopingMode ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetLoopingMode: looping mode = %d [%p]\n", mLoopingMode, this ); } void VectorRasterizeThread::Initialize() @@ -356,7 +356,7 @@ void VectorRasterizeThread::Initialize() SetSize( width, height ); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Initialize: file = %s [%d frames, %f fps]\n", mUrl.c_str(), mTotalFrame, mFrameRate ); + 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() @@ -370,7 +370,7 @@ void VectorRasterizeThread::Rasterize() if( ( mPlayState == PlayState::PAUSED || mPlayState == PlayState::STOPPED ) && !mNeedRender && !mDestroyThread ) { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Wait\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Wait [%p]\n", this ); mConditionalWait.Wait( lock ); } @@ -449,11 +449,15 @@ void VectorRasterizeThread::Rasterize() } // Rasterize - mVectorRenderer.Render( currentFrame ); + if( !mVectorRenderer.Render( currentFrame ) ) + { + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Rendering failed. Try again later.[%d] [%p]\n", currentFrame, this ); + mUpdateFrameNumber = false; + } if( !resourceReady ) { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Resource ready trigger\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Resource ready trigger [%p]\n", this ); mResourceReadyTrigger->Trigger(); } @@ -467,7 +471,7 @@ void VectorRasterizeThread::Rasterize() // Animation is finished mAnimationFinishedTrigger->Trigger(); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Animation is finished\n" ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::Rasterize: Animation is finished [%p]\n", this ); } auto timeToSleepUntil = currentFrameStartTime + std::chrono::nanoseconds( mFrameDurationNanoSeconds ); @@ -475,7 +479,7 @@ 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", currentFrame, 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 ); -- 2.7.4