From 34a9372d83f9a8a63ef0abcc93c652448e308562 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 20 Jul 2022 14:33:19 +0900 Subject: [PATCH] (Vector) Change SetPlayRange and fix a crash Change-Id: I494f55e6a1a1c13ce55aa546e8795f0919bab6a6 --- .../utc-Dali-AnimatedVectorImageVisual.cpp | 19 ++++--- .../vector-animation-task.cpp | 58 ++++++++++++---------- .../animated-vector-image/vector-animation-task.h | 8 ++- .../vector-animation-thread.cpp | 4 +- 4 files changed, 54 insertions(+), 35 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp index 0529655..6299c0c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp @@ -709,8 +709,9 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) Renderer renderer = actor.GetRendererAt(0u); DALI_TEST_CHECK(renderer); - Property::Map map = actor.GetProperty(DummyControl::Property::TEST_VISUAL); - Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_RANGE); + Property::Map map = actor.GetProperty(DummyControl::Property::TEST_VISUAL); + Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_RANGE); + int totalFrameNumber = map.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER)->Get(); int resultStartFrame, resultEndFrame; Property::Array* result = value->GetArray(); @@ -744,8 +745,8 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) result->GetElementAt(0).Get(resultStartFrame); result->GetElementAt(1).Get(resultEndFrame); - DALI_TEST_EQUALS(startFrame, resultStartFrame, TEST_LOCATION); // Should not be changed - DALI_TEST_EQUALS(endFrame, resultEndFrame, TEST_LOCATION); + DALI_TEST_EQUALS(resultStartFrame, 1, TEST_LOCATION); + DALI_TEST_EQUALS(resultEndFrame, totalFrameNumber - 1, TEST_LOCATION); // Should be clamped DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, Property::Map()); @@ -1854,8 +1855,14 @@ int UtcDaliAnimatedVectorImageVisualSize(void) application.SendNotification(); - // Trigger count is 2 - load, resource ready - DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + // Trigger count is 1 - load + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + // Trigger count is 1 - resource ready + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); textureTrace.Enable(true); diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp index b79f422..302fce7 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp @@ -95,6 +95,10 @@ void VectorAnimationTask::Finalize() { mAnimationFinishedTrigger.reset(); } + if(mLoadCompletedTrigger) + { + mLoadCompletedTrigger.reset(); + } mVectorRenderer.Finalize(); @@ -144,6 +148,11 @@ void VectorAnimationTask::RequestLoad(const std::string& url) mVectorAnimationThread.AddTask(this); } +bool VectorAnimationTask::IsLoadRequested() const +{ + return mLoadRequest; +} + void VectorAnimationTask::SetAnimationData(const AnimationData& data) { ConditionalWait::ScopedLock lock(mConditionalWait); @@ -280,38 +289,33 @@ void VectorAnimationTask::SetPlayRange(const Property::Array& playRange) } // Make sure the range specified is between 0 and the total frame number - if(startFrame < mTotalFrame && endFrame < mTotalFrame) + startFrame = std::min(startFrame, mTotalFrame - 1); + endFrame = std::min(endFrame, mTotalFrame - 1); + + // If the range is not in order swap values + if(startFrame > endFrame) { - // If the range is not in order swap values - if(startFrame > endFrame) + uint32_t temp = startFrame; + startFrame = endFrame; + endFrame = temp; + } + + if(startFrame != mStartFrame || endFrame != mEndFrame) + { + mStartFrame = startFrame; + mEndFrame = endFrame; + + // If the current frame is out of the range, change the current frame also. + if(mStartFrame > mCurrentFrame) { - uint32_t temp = startFrame; - startFrame = endFrame; - endFrame = temp; + mCurrentFrame = mStartFrame; } - - if(startFrame != mStartFrame || endFrame != mEndFrame) + else if(mEndFrame < mCurrentFrame) { - mStartFrame = startFrame; - mEndFrame = endFrame; - - // If the current frame is out of the range, change the current frame also. - if(mStartFrame > mCurrentFrame) - { - mCurrentFrame = mStartFrame; - } - else if(mEndFrame < mCurrentFrame) - { - mCurrentFrame = mEndFrame; - } - - DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetPlayRange: [%d, %d] [%s] [%p]\n", mStartFrame, mEndFrame, mUrl.c_str(), this); + mCurrentFrame = mEndFrame; } - } - else - { - DALI_LOG_ERROR("VectorAnimationTask::SetPlayRange: Invalid range (%d, %d) [%s] [%p]\n", startFrame, endFrame, mUrl.c_str(), this); - return; + + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "VectorAnimationTask::SetPlayRange: [%d, %d] [%s] [%p]\n", mStartFrame, mEndFrame, mUrl.c_str(), this); } } diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h index 1e4ff4c..0ca2295 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h @@ -139,13 +139,19 @@ public: void SetRenderer(Renderer renderer); /** - * @brief Request to load the animation file. + * @brief Requests to load the animation file. * * @param[in] url The url of the vector animation file */ void RequestLoad(const std::string& url); /** + * @brief Queries whether loading is requested. + * @return True if loading is requested. + */ + bool IsLoadRequested() const; + + /** * @brief Sets data to specify animation playback. * @param[in] data The animation data */ diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp index 7e505c9..c6dbdb6 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp @@ -85,7 +85,9 @@ void VectorAnimationThread::AddTask(VectorAnimationTaskPtr task) { ConditionalWait::ScopedLock lock(mConditionalWait); - if(mAnimationTasks.end() == std::find(mAnimationTasks.begin(), mAnimationTasks.end(), task)) + // Find if the task is already in the list except loading task + auto iter = std::find_if(mAnimationTasks.begin(), mAnimationTasks.end(), [task](VectorAnimationTaskPtr& element) { return (element == task && !element->IsLoadRequested()); }); + if(iter == mAnimationTasks.end()) { auto currentTime = task->CalculateNextFrameTime(true); // Rasterize as soon as possible -- 2.7.4