X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-vector-animation-renderer.cpp;h=e6456ec7dab867be63419a7dd516f1aa2ad5a173;hp=b039c5780751c7302c31df142449e9877fff7edb;hb=e8954068388a568c9d89de31ae033fe94d0ce20d;hpb=271110063e8b896a45d7c9116cf4ad53585933bd 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 old mode 100755 new mode 100644 index b039c57..e6456ec --- 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) 2022 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. @@ -15,34 +15,50 @@ * */ +#include #include +#include #include #include +#include +#include +#include +#include +#include namespace Dali { - namespace Internal { - namespace Adaptor { +namespace +{ +Dali::Internal::Adaptor::VectorAnimationRenderer* gVectorAnimationRenderer = nullptr; +} -class VectorAnimationRenderer: public Dali::BaseObject +class VectorAnimationRenderer : public Dali::BaseObject { public: - - VectorAnimationRenderer( const std::string& url ) - : mUrl( url ), + VectorAnimationRenderer() + : mUrl(), mRenderer(), - mWidth( 0 ), - mHeight( 0 ), - mPreviousFrame( 0 ), - mFrameRate( 60.0f ) + mWidth(0), + mHeight(0), + mDefaultWidth(0), + mDefaultHeight(0), + mTotalFrameNumber(VECTOR_ANIMATION_TOTAL_FRAME_NUMBER), + mPreviousFrame(0), + mDelayTime(0), + mDroppedFrames(0), + mFrameRate(60.0f), + mTestFrameDrop(false), + mNeedDroppedFrames(false), + mEventThreadCallback(new EventThreadCallback(MakeCallback(this, &VectorAnimationRenderer::OnTriggered))) { mCount++; - if( mCount == 2 ) + if(mCount == 2) { mFrameRate = 0.1f; } @@ -53,36 +69,73 @@ public: mCount--; } - void SetRenderer( Dali::Renderer renderer ) + bool Load(const std::string& url) { - mRenderer = renderer; - - if( mWidth != 0 && mHeight != 0 ) + Dali::Mutex::ScopedLock lock(mMutex); + mUrl = url; + if(mUrl == "invalid.json") { - Dali::TextureSet textureSet = mRenderer.GetTextures(); - Dali::Texture texture = Dali::Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, mWidth, mHeight ); - textureSet.SetTexture( 0, texture ); - mUploadCompletedSignal.Emit(); + mLoadFailed = true; + return false; } + else if(mUrl == "framedrop.json") + { + // Change total frame number for test + mTotalFrameNumber = 200; + } + + mDefaultWidth = 100; + mDefaultHeight = 100; + + return true; } - void SetSize( uint32_t width, uint32_t height ) + void SetRenderer(Dali::Renderer renderer) { - mWidth = width; + mRenderer = renderer; + } + + void SetSize(uint32_t width, uint32_t height) + { + Dali::Mutex::ScopedLock lock(mMutex); + mWidth = width; mHeight = height; - if( mRenderer ) + if(!mLoadFailed) { - Dali::TextureSet textureSet = mRenderer.GetTextures(); - Dali::Texture texture = Dali::Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, mWidth, mHeight ); - textureSet.SetTexture( 0, texture ); - mUploadCompletedSignal.Emit(); + mNeedTrigger = true; + mResourceReady = false; } } - bool Render( uint32_t frameNumber ) + bool Render(uint32_t frameNumber) { - if( frameNumber == 1 && mPreviousFrame != frameNumber ) + Dali::Mutex::ScopedLock lock(mMutex); + if(mWidth == 0 || mHeight == 0) + { + return false; + } + + if(mTestFrameDrop) + { + std::this_thread::sleep_for(std::chrono::milliseconds(static_cast(mDelayTime))); + mTestFrameDrop = false; + 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; // For test corverage @@ -94,7 +147,7 @@ public: uint32_t GetTotalFrameNumber() const { - return 5; + return mTotalFrameNumber; } float GetFrameRate() const @@ -102,10 +155,39 @@ public: return mFrameRate; } - void GetDefaultSize( uint32_t& width, uint32_t& height ) const + void GetDefaultSize(uint32_t& width, uint32_t& height) const + { + width = mDefaultWidth; + height = mDefaultHeight; + } + + 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; + } + + void InvalidateBuffer() { - width = 100; - height = 100; + Dali::Mutex::ScopedLock lock(mMutex); + if(mResourceReady) + { + mNeedTrigger = true; + mResourceReady = false; + } } Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal() @@ -113,49 +195,80 @@ public: return mUploadCompletedSignal; } -public: + void OnTriggered() + { + if(!mResourceReady) + { + mResourceReady = true; + + Dali::TextureSet textureSet = mRenderer.GetTextures(); + Dali::Texture texture = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, mWidth, mHeight); + textureSet.SetTexture(0, texture); + + Devel::PixelBuffer pixelBuffer = Devel::PixelBuffer::New(mWidth, mHeight, Pixel::RGBA8888); + Dali::PixelData pixelData = Devel::PixelBuffer::Convert(pixelBuffer); + texture.Upload(pixelData); + mUploadCompletedSignal.Emit(); + } + } + +public: static uint32_t mCount; - std::string mUrl; + std::string mUrl; Dali::Renderer mRenderer; - uint32_t mWidth; - uint32_t mHeight; - uint32_t mPreviousFrame; - float mFrameRate; + Dali::Mutex mMutex; + uint32_t mWidth; + uint32_t mHeight; + uint32_t mDefaultWidth; + uint32_t mDefaultHeight; + uint32_t mTotalFrameNumber; + uint32_t mPreviousFrame; + uint32_t mDelayTime; + uint32_t mDroppedFrames; + float mFrameRate; + bool mTestFrameDrop; + bool mNeedDroppedFrames; + bool mLoadFailed{false}; + bool mResourceReady{false}; + bool mNeedTrigger{true}; + Dali::VectorAnimationRenderer::UploadCompletedSignalType mUploadCompletedSignal; + std::unique_ptr mEventThreadCallback; }; uint32_t VectorAnimationRenderer::mCount = 0; -inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer ) +inline VectorAnimationRenderer& GetImplementation(Dali::VectorAnimationRenderer& renderer) { - DALI_ASSERT_ALWAYS( renderer && "VectorAnimationRenderer handle is empty." ); + DALI_ASSERT_ALWAYS(renderer && "VectorAnimationRenderer handle is empty."); BaseObject& handle = renderer.GetBaseObject(); - return static_cast< Internal::Adaptor::VectorAnimationRenderer& >( handle ); + return static_cast(handle); } -inline const VectorAnimationRenderer& GetImplementation( const Dali::VectorAnimationRenderer& renderer ) +inline const VectorAnimationRenderer& GetImplementation(const Dali::VectorAnimationRenderer& renderer) { - DALI_ASSERT_ALWAYS( renderer && "VectorAnimationRenderer handle is empty." ); + DALI_ASSERT_ALWAYS(renderer && "VectorAnimationRenderer handle is empty."); const BaseObject& handle = renderer.GetBaseObject(); - return static_cast< const Internal::Adaptor::VectorAnimationRenderer& >( handle ); + return static_cast(handle); } } // namespace Adaptor } // namespace Internal - /********************************************************************************/ /********************************* 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 ); + return VectorAnimationRenderer(animationRenderer); } VectorAnimationRenderer::VectorAnimationRenderer() @@ -166,19 +279,19 @@ VectorAnimationRenderer::~VectorAnimationRenderer() { } -VectorAnimationRenderer::VectorAnimationRenderer( Internal::Adaptor::VectorAnimationRenderer* internal ) -: BaseHandle( internal ) +VectorAnimationRenderer::VectorAnimationRenderer(Internal::Adaptor::VectorAnimationRenderer* internal) +: BaseHandle(internal) { } -VectorAnimationRenderer::VectorAnimationRenderer( const VectorAnimationRenderer& handle ) -: BaseHandle( handle ) +VectorAnimationRenderer::VectorAnimationRenderer(const VectorAnimationRenderer& handle) +: BaseHandle(handle) { } -VectorAnimationRenderer& VectorAnimationRenderer::operator=( const VectorAnimationRenderer& rhs ) +VectorAnimationRenderer& VectorAnimationRenderer::operator=(const VectorAnimationRenderer& rhs) { - BaseHandle::operator=( rhs ); + BaseHandle::operator=(rhs); return *this; } @@ -186,44 +299,76 @@ void VectorAnimationRenderer::Finalize() { } -void VectorAnimationRenderer::SetRenderer( Renderer renderer ) +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 ); + Internal::Adaptor::GetImplementation(*this).SetRenderer(renderer); } -void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height ) +void VectorAnimationRenderer::SetSize(uint32_t width, uint32_t height) { - Internal::Adaptor::GetImplementation( *this ).SetSize( width, height ); + Internal::Adaptor::GetImplementation(*this).SetSize(width, height); } -bool VectorAnimationRenderer::Render( uint32_t frameNumber ) +bool VectorAnimationRenderer::Render(uint32_t frameNumber) { - return Internal::Adaptor::GetImplementation( *this ).Render( frameNumber ); + return Internal::Adaptor::GetImplementation(*this).Render(frameNumber); } 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(); + return Internal::Adaptor::GetImplementation(*this).GetFrameRate(); +} + +void VectorAnimationRenderer::GetDefaultSize(uint32_t& width, uint32_t& height) const +{ + Internal::Adaptor::GetImplementation(*this).GetDefaultSize(width, height); +} + +void VectorAnimationRenderer::GetLayerInfo(Property::Map& map) const +{ } -void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height ) const +bool VectorAnimationRenderer::GetMarkerInfo(const std::string& marker, uint32_t& startFrame, uint32_t& endFrame) const { - Internal::Adaptor::GetImplementation( *this ).GetDefaultSize( width, height ); + return Internal::Adaptor::GetImplementation(*this).GetMarkerInfo(marker, startFrame, endFrame); } -void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const +void VectorAnimationRenderer::InvalidateBuffer() { + return Internal::Adaptor::GetImplementation(*this).InvalidateBuffer(); } VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal() { - return Internal::Adaptor::GetImplementation( *this ).UploadCompletedSignal(); + return Internal::Adaptor::GetImplementation(*this).UploadCompletedSignal(); +} + +} // namespace Dali + +namespace Test +{ +namespace VectorAnimationRenderer +{ +void DelayRendering(uint32_t delay) +{ + Dali::Internal::Adaptor::gVectorAnimationRenderer->mDelayTime = delay; + Dali::Internal::Adaptor::gVectorAnimationRenderer->mTestFrameDrop = true; } -} // namespace Dali; +uint32_t GetDroppedFrames() +{ + return Dali::Internal::Adaptor::gVectorAnimationRenderer->mDroppedFrames; +} +} // namespace VectorAnimationRenderer +} // namespace Test