X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-vector-animation-renderer.cpp;h=33a27b5c45b78eeca5fee0dbc26f8ade9cda651e;hb=6970e395a31aae5e97be905e01e47fd49e043f94;hp=f8c0c365d47c407569e6da8301902a3bb4b0a2a9;hpb=7e184105f63836152d054c939bd0cb73f8dcc07a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 f8c0c36..33a27b5 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) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -18,6 +18,11 @@ #include #include #include +#include +#include +#include +#include +#include namespace Dali { @@ -28,17 +33,27 @@ namespace Internal namespace Adaptor { +namespace +{ +Dali::Internal::Adaptor::VectorAnimationRenderer* gVectorAnimationRenderer = nullptr; +} + class VectorAnimationRenderer: public Dali::BaseObject { public: - VectorAnimationRenderer( const std::string& url ) - : mUrl( url ), + VectorAnimationRenderer() + : mUrl(), mRenderer(), mWidth( 0 ), mHeight( 0 ), + mTotalFrameNumber(VECTOR_ANIMATION_TOTAL_FRAME_NUMBER), mPreviousFrame( 0 ), - mFrameRate( 60.0f ) + mDelayTime(0), + mDroppedFrames(0), + mFrameRate( 60.0f ), + mNeedDroppedFrames(false), + mEventThreadCallback( new EventThreadCallback( MakeCallback( this, &VectorAnimationRenderer::OnTriggered ) ) ) { mCount++; @@ -53,6 +68,21 @@ public: mCount--; } + bool Load(const std::string& url) + { + mUrl = url; + if(mUrl == "invalid.json") + { + return false; + } + else if(mUrl == "framedrop.json") + { + // Change total frame number for test + mTotalFrameNumber = 200; + } + return true; + } + void SetRenderer( Dali::Renderer renderer ) { mRenderer = renderer; @@ -82,6 +112,25 @@ public: bool Render( uint32_t frameNumber ) { + if(mDelayTime != 0) + { + std::this_thread::sleep_for(std::chrono::milliseconds(static_cast(mDelayTime))); + mDelayTime = 0; + mNeedDroppedFrames = true; + } + else if(mNeedDroppedFrames) + { + mDroppedFrames = (frameNumber > mPreviousFrame) ? frameNumber - mPreviousFrame - 1: frameNumber + (mTotalFrameNumber - mPreviousFrame) - 1; + mNeedTrigger = true; + mNeedDroppedFrames = false; + } + + if( mNeedTrigger ) + { + mEventThreadCallback->Trigger(); + mNeedTrigger = false; + } + if( frameNumber == 1 && mPreviousFrame != frameNumber ) { mPreviousFrame = frameNumber; @@ -94,7 +143,7 @@ public: uint32_t GetTotalFrameNumber() const { - return 5; + return mTotalFrameNumber; } float GetFrameRate() const @@ -108,8 +157,23 @@ public: height = 100; } - void GetLayerInfo( Property::Map& map ) const + bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const { + if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_1 ) == 0 ) + { + startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_1; + endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_1; + } + else if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_2 ) == 0 ) + { + startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_2; + endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_2; + } + else + { + return false; + } + return true; } Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal() @@ -117,20 +181,31 @@ public: return mUploadCompletedSignal; } + void OnTriggered() + { + } + public: static uint32_t mCount; + static bool mNeedTrigger; std::string mUrl; Dali::Renderer mRenderer; uint32_t mWidth; uint32_t mHeight; + uint32_t mTotalFrameNumber; uint32_t mPreviousFrame; + uint32_t mDelayTime; + uint32_t mDroppedFrames; float mFrameRate; + bool mNeedDroppedFrames; Dali::VectorAnimationRenderer::UploadCompletedSignalType mUploadCompletedSignal; + std::unique_ptr< EventThreadCallback > mEventThreadCallback; }; uint32_t VectorAnimationRenderer::mCount = 0; +bool VectorAnimationRenderer::mNeedTrigger = true; inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer ) { @@ -155,9 +230,11 @@ inline const VectorAnimationRenderer& GetImplementation( const Dali::VectorAnima /********************************* PUBLIC CLASS *******************************/ /********************************************************************************/ -VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url ) +VectorAnimationRenderer VectorAnimationRenderer::New() { - Internal::Adaptor::VectorAnimationRenderer* animationRenderer = new Internal::Adaptor::VectorAnimationRenderer( url ); + Internal::Adaptor::VectorAnimationRenderer* animationRenderer = new Internal::Adaptor::VectorAnimationRenderer(); + + Internal::Adaptor::gVectorAnimationRenderer = animationRenderer; return VectorAnimationRenderer( animationRenderer ); } @@ -186,6 +263,15 @@ VectorAnimationRenderer& VectorAnimationRenderer::operator=( const VectorAnimati return *this; } +void VectorAnimationRenderer::Finalize() +{ +} + +bool VectorAnimationRenderer::Load(const std::string& url) +{ + return Internal::Adaptor::GetImplementation( *this ).Load(url); +} + void VectorAnimationRenderer::SetRenderer( Renderer renderer ) { Internal::Adaptor::GetImplementation( *this ).SetRenderer( renderer ); @@ -218,7 +304,11 @@ void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const { - Internal::Adaptor::GetImplementation( *this ).GetLayerInfo( map ); +} + +bool VectorAnimationRenderer::GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const +{ + return Internal::Adaptor::GetImplementation( *this ).GetMarkerInfo( marker, startFrame, endFrame ); } VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal() @@ -226,5 +316,28 @@ VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::Upl return Internal::Adaptor::GetImplementation( *this ).UploadCompletedSignal(); } -} // namespace Dali; +} // namespace Dali + +namespace Test +{ +namespace VectorAnimationRenderer +{ + +void RequestTrigger() +{ + Dali::Internal::Adaptor::VectorAnimationRenderer::mNeedTrigger = true; +} + +void DelayRendering(uint32_t delay) +{ + Dali::Internal::Adaptor::gVectorAnimationRenderer->mDelayTime = delay; +} + +uint32_t GetDroppedFrames() +{ + return Dali::Internal::Adaptor::gVectorAnimationRenderer->mDroppedFrames; +} + +} // VectorAnimationRenderer +} // Test