From 88af55c0bf70653347b6918a83bc9a9ee5972e24 Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Fri, 1 Apr 2022 21:14:10 +0900 Subject: [PATCH] Call ResourceReady callback even image loading failed. image-visual and svg-visual and npatch-visual call ResourceReady callback even they fail to load image. But when animated image load faild, it doesn't call ResourceReady. This patch make both image-used visuals call ResourceReady callback even if load state is failed. Change-Id: I7f0a267b7103d0d4df0753236cc90b2e467c707d Signed-off-by: Eunki, Hong --- .../src/dali-toolkit/utc-Dali-ImageView.cpp | 138 ++++++++++++++++++++- .../internal/visuals/image/image-visual.cpp | 6 - dali-toolkit/internal/visuals/image/image-visual.h | 5 - .../internal/visuals/npatch/npatch-visual.cpp | 8 +- .../internal/visuals/npatch/npatch-visual.h | 5 - dali-toolkit/internal/visuals/svg/svg-visual.cpp | 6 - dali-toolkit/internal/visuals/svg/svg-visual.h | 7 +- dali-toolkit/internal/visuals/visual-base-impl.cpp | 3 +- dali-toolkit/internal/visuals/visual-base-impl.h | 4 +- 9 files changed, 141 insertions(+), 41 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index ddd45ba..ab50286 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -76,7 +77,8 @@ static const char* gImage_600_RGB = TEST_RESOURCE_DIR "/test-image-600.jpg"; // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif"; -const char* TEST_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json"; +const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg"; +const char* TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json"; void TestUrl(ImageView imageView, const std::string url) { @@ -2359,7 +2361,7 @@ int UtcDaliImageViewFittingModesWithAnimatedVectorImageVisual(void) ImageView imageView = ImageView::New(); Property::Map imageMap; imageMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE); - imageMap.Add(Toolkit::ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME); // 249x169 image + imageMap.Add(Toolkit::ImageVisual::Property::URL, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME); // 249x169 image imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 600)); @@ -3335,4 +3337,134 @@ int UtcDaliImageViewOnResourceReadySignalWithBrokenAlphaMask02(void) DALI_TEST_EQUALS(gResourceReadySignalCounter, expectResourceReadySignalCounter, TEST_LOCATION); END_TEST; -} \ No newline at end of file +} + +int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) +{ + tet_infoline("Test signal handler various case."); + + ToolkitTestApplication application; + + auto TestResourceReadyUrl = [&application](int eventTriggerCount, bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& mask, const char* location) { + gResourceReadySignalCounter = 0; + + Property::Map map; + map[Toolkit::ImageVisual::Property::URL] = url; + if(!mask.empty()) + { + map[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = mask; + } + map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = isSynchronous; + + ImageView imageView = ImageView::New(); + imageView[Toolkit::ImageView::Property::IMAGE] = map; + imageView[Actor::Property::SIZE] = Vector2(100.0f, 200.0f); + imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal); + + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(); + + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(eventTriggerCount), true, location); + + tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE), loadSuccess ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION); + + imageView.Unparent(); + }; + + auto TestAuxiliaryResourceReadyUrl = [&application](bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& auxiliaryUrl, const char* location) { + gResourceReadySignalCounter = 0; + + Property::Map map; + map[Toolkit::ImageVisual::Property::URL] = url; + map[Toolkit::DevelImageVisual::Property::AUXILIARY_IMAGE] = auxiliaryUrl; + map[Toolkit::DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA] = 0.5f; + map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = isSynchronous; + + ImageView imageView = ImageView::New(); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map); + imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f)); + imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal); + application.GetScene().Add(imageView); + + application.SendNotification(); + application.Render(); + + if(!isSynchronous) + { + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, location); + } + + tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE), loadSuccess ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION); + + imageView.Unparent(); + }; + + // Case 1 : asynchronous loading + tet_printf("Test invalid single simple image Asynchronous\n"); + + // Test normal case + TestResourceReadyUrl(1, 0, 1, gImage_600_RGB, "", TEST_LOCATION); + TestResourceReadyUrl(1, 0, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // 1 rasterize + TestResourceReadyUrl(1, 0, 1, TEST_BROKEN_IMAGE_L, "", TEST_LOCATION); + + TestResourceReadyUrl(2, 0, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION); // 2 image loading - batch size + TestResourceReadyUrl(1, 0, 1, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME, "", TEST_LOCATION); // 1 rasterize + + TestResourceReadyUrl(3, 0, 1, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); // 2 image loading + 1 applymask + + TestAuxiliaryResourceReadyUrl(0, 1, TEST_BROKEN_IMAGE_L, gImage_34_RGBA, TEST_LOCATION); + + // Test broken case + TestResourceReadyUrl(1, 0, 0, "invalid.jpg", "", TEST_LOCATION); + TestResourceReadyUrl(0, 0, 0, "invalid.svg", "", TEST_LOCATION); // 0 rasterize + TestResourceReadyUrl(1, 0, 0, "invalid.9.png", "", TEST_LOCATION); + TestResourceReadyUrl(1, 0, 0, "invalid.gif", "", TEST_LOCATION); // 1 image loading + TestResourceReadyUrl(0, 0, 0, "invalid.json", "", TEST_LOCATION); // 0 rasterize + + TestResourceReadyUrl(2, 0, 0, "invalid.jpg", "invalid.png", TEST_LOCATION); // 2 image loading + TestResourceReadyUrl(2, 0, 1, gImage_600_RGB, "invalid.png", TEST_LOCATION); // 2 image loading + TestResourceReadyUrl(2, 0, 0, "invalid.jpg", gImage_34_RGBA, TEST_LOCATION); // 2 image loading + + TestAuxiliaryResourceReadyUrl(0, 0, "invalid.9.png", "invalid.png", TEST_LOCATION); + TestAuxiliaryResourceReadyUrl(0, 1, TEST_BROKEN_IMAGE_L, "invalid.png", TEST_LOCATION); + TestAuxiliaryResourceReadyUrl(0, 0, "invalid.9.png", gImage_34_RGBA, TEST_LOCATION); + + // Case 2 : Synchronous loading + tet_printf("Test invalid single simple image Synchronous\n"); + + // Test normal case + TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, "", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // synchronous rasterize + TestResourceReadyUrl(0, 1, 1, TEST_BROKEN_IMAGE_L, "", TEST_LOCATION); + + TestResourceReadyUrl(1, 1, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION); // first frame image loading sync + second frame image loading async + TestResourceReadyUrl(0, 1, 1, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME, "", TEST_LOCATION); // synchronous rasterize + + TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); + + TestAuxiliaryResourceReadyUrl(1, 1, TEST_BROKEN_IMAGE_L, gImage_34_RGBA, TEST_LOCATION); + + // Test broken case + TestResourceReadyUrl(0, 1, 0, "invalid.jpg", "", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 0, "invalid.svg", "", TEST_LOCATION); // 0 rasterize + TestResourceReadyUrl(0, 1, 0, "invalid.9.png", "", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 0, "invalid.gif", "", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 0, "invalid.json", "", TEST_LOCATION); // 0 rasterize + + TestResourceReadyUrl(0, 1, 0, "invalid.jpg", "invalid.png", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, "invalid.png", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 0, "invalid.jpg", gImage_34_RGBA, TEST_LOCATION); + + TestAuxiliaryResourceReadyUrl(1, 0, "invalid.9.png", "invalid.png", TEST_LOCATION); + TestAuxiliaryResourceReadyUrl(1, 1, TEST_BROKEN_IMAGE_L, "invalid.png", TEST_LOCATION); + TestAuxiliaryResourceReadyUrl(1, 0, "invalid.9.png", gImage_34_RGBA, TEST_LOCATION); + + END_TEST; +} diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 7b20e1f..e971be6 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -821,12 +821,6 @@ void ImageVisual::OnSetTransform() } } -bool ImageVisual::IsResourceReady() const -{ - return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY || - mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED); -} - void ImageVisual::UpdateShader() { if(mImpl->mRenderer) diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index bf9b64b..0cbc3ba 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -224,11 +224,6 @@ protected: void OnSetTransform() override; /** - * @copydoc Visual::Base::IsResourceReady - */ - bool IsResourceReady() const override; - - /** * @copydoc Visual::Base::UpdateShader */ void UpdateShader() override; diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index 5fc5dd0..b5c9b51 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -91,7 +91,7 @@ void NPatchVisual::LoadImages() auto preMultiplyOnLoading = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; mAuxiliaryPixelBuffer = textureManager.LoadPixelBuffer(mAuxiliaryUrl, Dali::ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, synchronousLoading, this, true, preMultiplyOnLoading); - // If synchronousLoading is true, we can check the auxiliaryResource's statue now. + // If synchronousLoading is true, we can check the auxiliaryResource's status now. if(synchronousLoading) { mAuxiliaryResourceStatus = mAuxiliaryPixelBuffer ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED; @@ -234,12 +234,6 @@ void NPatchVisual::OnSetTransform() } } -bool NPatchVisual::IsResourceReady() const -{ - return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY || - mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED); -} - void NPatchVisual::DoCreatePropertyMap(Property::Map& map) const { map.Clear(); diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.h b/dali-toolkit/internal/visuals/npatch/npatch-visual.h index d537a37..b86dc41 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.h +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.h @@ -137,11 +137,6 @@ protected: */ void OnSetTransform() override; - /** - * @copydoc Visual::Base::IsResourceReady - */ - bool IsResourceReady() const override; - private: /** * Loads the NPatch image and the Auxiliary image if needed diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index 599d3de..80c6958 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -359,12 +359,6 @@ void SvgVisual::OnSetTransform() } } -bool SvgVisual::IsResourceReady() const -{ - return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY || - mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED); -} - void SvgVisual::UpdateShader() { if(mImpl->mRenderer) diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index 66de43c..2f49e16 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.h +++ b/dali-toolkit/internal/visuals/svg/svg-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H /* - * Copyright (c) 2021 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. @@ -133,11 +133,6 @@ protected: void OnSetTransform() override; /** - * @copydoc Visual::Base::IsResourceReady - */ - bool IsResourceReady() const override; - - /** * @copydoc Visual::Base::UpdateShader */ void UpdateShader() override; diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 8601cb3..953e23e 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -765,7 +765,8 @@ void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus) bool Visual::Base::IsResourceReady() const { - return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY); + return (mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY || + mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED); } bool Visual::Base::IsSynchronousLoadingRequired() const diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h index 0f57210..336a62d 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -239,8 +239,8 @@ public: void ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus); /** - * @brief Called when the visuals resources are loaded / ready - * @return true if ready, false otherwise + * @brief Called when the visuals resources are loaded / ready or failed (mean, broken image ready) + * @return true if ready or failed (mean, broken image ready), false otherwise */ virtual bool IsResourceReady() const; -- 2.7.4