X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Ftexture-manager-impl.cpp;h=49867c4f40f67fd39e260f36517c3c8ec78d7a85;hp=bf78d250949cce9bb714b97e44abd0f291d5071a;hb=12fc433eba468fe62254c4ebfb04d57697632077;hpb=4b11a25bb26aeb1eaef96ac024de6009a790387f diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.cpp b/dali-toolkit/internal/visuals/texture-manager-impl.cpp index bf78d25..49867c4 100644 --- a/dali-toolkit/internal/visuals/texture-manager-impl.cpp +++ b/dali-toolkit/internal/visuals/texture-manager-impl.cpp @@ -1,5 +1,5 @@ - /* - * Copyright (c) 2020 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. @@ -19,38 +19,40 @@ #include // EXTERNAL HEADERS -#include -#include -#include #include #include -#include -#include #include +#include #include +#include +#include +#include +#include // INTERNAL HEADERS +#include #include -#include #include +#include +#include namespace { - -constexpr auto DEFAULT_NUMBER_OF_LOCAL_LOADER_THREADS = size_t{4u}; +constexpr auto INITIAL_CACHE_NUMBER = size_t{0u}; +constexpr auto DEFAULT_NUMBER_OF_LOCAL_LOADER_THREADS = size_t{4u}; constexpr auto DEFAULT_NUMBER_OF_REMOTE_LOADER_THREADS = size_t{8u}; -constexpr auto NUMBER_OF_LOCAL_LOADER_THREADS_ENV = "DALI_TEXTURE_LOCAL_THREADS"; +constexpr auto NUMBER_OF_LOCAL_LOADER_THREADS_ENV = "DALI_TEXTURE_LOCAL_THREADS"; constexpr auto NUMBER_OF_REMOTE_LOADER_THREADS_ENV = "DALI_TEXTURE_REMOTE_THREADS"; size_t GetNumberOfThreads(const char* environmentVariable, size_t defaultValue) { using Dali::EnvironmentVariable::GetEnvironmentVariable; - auto numberString = GetEnvironmentVariable(environmentVariable); - auto numberOfThreads = numberString ? std::strtoul(numberString, nullptr, 10) : 0; + auto numberString = GetEnvironmentVariable(environmentVariable); + auto numberOfThreads = numberString ? std::strtoul(numberString, nullptr, 10) : 0; constexpr auto MAX_NUMBER_OF_THREADS = 100u; - DALI_ASSERT_DEBUG( numberOfThreads < MAX_NUMBER_OF_THREADS ); - return ( numberOfThreads > 0 && numberOfThreads < MAX_NUMBER_OF_THREADS ) ? numberOfThreads : defaultValue; + DALI_ASSERT_DEBUG(numberOfThreads < MAX_NUMBER_OF_THREADS); + return (numberOfThreads > 0 && numberOfThreads < MAX_NUMBER_OF_THREADS) ? numberOfThreads : defaultValue; } size_t GetNumberOfLocalLoaderThreads() @@ -67,43 +69,38 @@ size_t GetNumberOfRemoteLoaderThreads() namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { - #ifdef DEBUG_ENABLED -Debug::Filter* gTextureManagerLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_TEXTURE_MANAGER" ); - -#define GET_LOAD_STATE_STRING( loadState ) \ - loadState == TextureManager::NOT_STARTED ? "NOT_STARTED" : \ - loadState == TextureManager::LOADING ? "LOADING" : \ - loadState == TextureManager::LOAD_FINISHED ? "LOAD_FINISHED" : \ - loadState == TextureManager::WAITING_FOR_MASK ? "WAITING_FOR_MASK" : \ - loadState == TextureManager::MASK_APPLYING ? "MASK_APPLYING" : \ - loadState == TextureManager::MASK_APPLIED ? "MASK_APPLIED" : \ - loadState == TextureManager::UPLOADED ? "UPLOADED" : \ - loadState == TextureManager::CANCELLED ? "CANCELLED" : \ - loadState == TextureManager::LOAD_FAILED ? "LOAD_FAILED" : "Unknown" +Debug::Filter* gTextureManagerLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_TEXTURE_MANAGER"); + +#define GET_LOAD_STATE_STRING(loadState) \ + loadState == TextureManager::LoadState::NOT_STARTED ? "NOT_STARTED" : loadState == TextureManager::LoadState::LOADING ? "LOADING" \ + : loadState == TextureManager::LoadState::LOAD_FINISHED ? "LOAD_FINISHED" \ + : loadState == TextureManager::LoadState::WAITING_FOR_MASK ? "WAITING_FOR_MASK" \ + : loadState == TextureManager::LoadState::MASK_APPLYING ? "MASK_APPLYING" \ + : loadState == TextureManager::LoadState::MASK_APPLIED ? "MASK_APPLIED" \ + : loadState == TextureManager::LoadState::UPLOADED ? "UPLOADED" \ + : loadState == TextureManager::LoadState::CANCELLED ? "CANCELLED" \ + : loadState == TextureManager::LoadState::LOAD_FAILED ? "LOAD_FAILED" \ + : "Unknown" #endif -const uint32_t DEFAULT_ATLAS_SIZE( 1024u ); ///< This size can fit 8 by 8 images of average size 128 * 128 -const Vector4 FULL_ATLAS_RECT( 0.0f, 0.0f, 1.0f, 1.0f ); ///< UV Rectangle that covers the full Texture -const int INVALID_INDEX( -1 ); ///< Invalid index used to represent a non-existant TextureInfo struct -const int INVALID_CACHE_INDEX( -1 ); ///< Invalid Cache index +const uint32_t DEFAULT_ATLAS_SIZE(1024u); ///< This size can fit 8 by 8 images of average size 128 * 128 +const Vector4 FULL_ATLAS_RECT(0.0f, 0.0f, 1.0f, 1.0f); ///< UV Rectangle that covers the full Texture +const int INVALID_INDEX(-1); ///< Invalid index used to represent a non-existant TextureInfo struct +const int INVALID_CACHE_INDEX(-1); ///< Invalid Cache index - -void PreMultiply( Devel::PixelBuffer pixelBuffer, TextureManager::MultiplyOnLoad& preMultiplyOnLoad ) +void PreMultiply(Devel::PixelBuffer pixelBuffer, TextureManager::MultiplyOnLoad& preMultiplyOnLoad) { - if( Pixel::HasAlpha( pixelBuffer.GetPixelFormat() ) ) + if(Pixel::HasAlpha(pixelBuffer.GetPixelFormat())) { - if( preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD ) + if(preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD) { pixelBuffer.MultiplyColorByAlpha(); } @@ -118,181 +115,251 @@ void PreMultiply( Devel::PixelBuffer pixelBuffer, TextureManager::MultiplyOnLoad TextureManager::MaskingData::MaskingData() : mAlphaMaskUrl(), - mAlphaMaskId( INVALID_TEXTURE_ID ), - mContentScaleFactor( 1.0f ), - mCropToMask( true ) + mAlphaMaskId(INVALID_TEXTURE_ID), + mContentScaleFactor(1.0f), + mCropToMask(true) { } TextureManager::TextureManager() -: mAsyncLocalLoaders( GetNumberOfLocalLoaderThreads(), [&]() { return AsyncLoadingHelper(*this); } ), - mAsyncRemoteLoaders( GetNumberOfRemoteLoaderThreads(), [&]() { return AsyncLoadingHelper(*this); } ), +: mAsyncLocalLoaders(GetNumberOfLocalLoaderThreads(), [&]() + { return AsyncLoadingHelper(*this); }), + mAsyncRemoteLoaders(GetNumberOfRemoteLoaderThreads(), [&]() + { return AsyncLoadingHelper(*this); }), mExternalTextures(), mLifecycleObservers(), mLoadQueue(), - mBrokenImageUrl(""), - mCurrentTextureId( 0 ), + mCurrentTextureId(0), mQueueLoadFlag(false) { + // Initialize the AddOn + RenderingAddOn::Get(); } TextureManager::~TextureManager() { - for( auto iter = mLifecycleObservers.Begin(), endIter = mLifecycleObservers.End(); iter != endIter; ++iter) + for(auto iter = mLifecycleObservers.Begin(), endIter = mLifecycleObservers.End(); iter != endIter; ++iter) { (*iter)->TextureManagerDestroyed(); } } +TextureSet TextureManager::LoadAnimatedImageTexture( + Dali::AnimatedImageLoading animatedImageLoading, uint32_t frameIndex, Dali::SamplingMode::Type samplingMode, bool synchronousLoading, TextureManager::TextureId& textureId, Dali::WrapMode::Type wrapModeU, Dali::WrapMode::Type wrapModeV, TextureUploadObserver* textureObserver) +{ + TextureSet textureSet; + + if(synchronousLoading) + { + Devel::PixelBuffer pixelBuffer; + if(animatedImageLoading) + { + pixelBuffer = animatedImageLoading.LoadFrame(frameIndex); + } + if(!pixelBuffer) + { + DALI_LOG_ERROR("TextureManager::LoadAnimatedImageTexture: Synchronous loading is failed\n"); + } + else + { + PixelData pixelData = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer + if(!textureSet) + { + Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight()); + texture.Upload(pixelData); + textureSet = TextureSet::New(); + textureSet.SetTexture(0u, texture); + } + } + } + else + { + auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; + textureId = RequestLoadInternal(animatedImageLoading.GetUrl(), INVALID_TEXTURE_ID, 1.0f, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, TextureManager::NO_ATLAS, false, StorageType::UPLOAD_TO_TEXTURE, textureObserver, true, TextureManager::ReloadPolicy::CACHED, preMultiply, animatedImageLoading, frameIndex, false); + TextureManager::LoadState loadState = GetTextureStateInternal(textureId); + if(loadState == TextureManager::LoadState::UPLOADED) + { + // UploadComplete has already been called - keep the same texture set + textureSet = GetTextureSet(textureId); + } + } + + if(textureSet) + { + Sampler sampler = Sampler::New(); + sampler.SetWrapMode(wrapModeU, wrapModeV); + textureSet.SetSampler(0u, sampler); + } + + return textureSet; +} + +Devel::PixelBuffer TextureManager::LoadPixelBuffer( + const VisualUrl& url, Dali::ImageDimensions desiredSize, Dali::FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode, bool synchronousLoading, TextureUploadObserver* textureObserver, bool orientationCorrection, TextureManager::MultiplyOnLoad& preMultiplyOnLoad) +{ + Devel::PixelBuffer pixelBuffer; + if(synchronousLoading) + { + if(url.IsValid()) + { + if(url.IsBufferResource()) + { + const EncodedImageBuffer& encodedImageBuffer = GetEncodedImageBuffer(url.GetUrl()); + if(encodedImageBuffer) + { + pixelBuffer = LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), desiredSize, fittingMode, samplingMode, orientationCorrection); + } + } + else + { + pixelBuffer = LoadImageFromFile(url.GetUrl(), desiredSize, fittingMode, samplingMode, orientationCorrection); + } + if(pixelBuffer && preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD) + { + PreMultiply(pixelBuffer, preMultiplyOnLoad); + } + } + } + else + { + RequestLoadInternal(url, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, TextureManager::NO_ATLAS, false, StorageType::RETURN_PIXEL_BUFFER, textureObserver, orientationCorrection, TextureManager::ReloadPolicy::FORCED, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u, false); + } + + return pixelBuffer; +} + TextureSet TextureManager::LoadTexture( - const VisualUrl& url, Dali::ImageDimensions desiredSize, Dali::FittingMode::Type fittingMode, - Dali::SamplingMode::Type samplingMode, MaskingDataPointer& maskInfo, - bool synchronousLoading, TextureManager::TextureId& textureId, Vector4& textureRect, - Dali::ImageDimensions& textureRectSize, bool& atlasingStatus, bool& loadingStatus, - Dali::WrapMode::Type wrapModeU, Dali::WrapMode::Type wrapModeV, TextureUploadObserver* textureObserver, - AtlasUploadObserver* atlasObserver, ImageAtlasManagerPtr imageAtlasManager, bool orientationCorrection, - TextureManager::ReloadPolicy reloadPolicy, TextureManager::MultiplyOnLoad& preMultiplyOnLoad ) + const VisualUrl& url, Dali::ImageDimensions desiredSize, Dali::FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode, MaskingDataPointer& maskInfo, bool synchronousLoading, TextureManager::TextureId& textureId, Vector4& textureRect, Dali::ImageDimensions& textureRectSize, bool& atlasingStatus, bool& loadingStatus, Dali::WrapMode::Type wrapModeU, Dali::WrapMode::Type wrapModeV, TextureUploadObserver* textureObserver, AtlasUploadObserver* atlasObserver, ImageAtlasManagerPtr imageAtlasManager, bool orientationCorrection, TextureManager::ReloadPolicy reloadPolicy, TextureManager::MultiplyOnLoad& preMultiplyOnLoad) { TextureSet textureSet; loadingStatus = false; - textureRect = FULL_ATLAS_RECT; + textureRect = FULL_ATLAS_RECT; - if( VisualUrl::TEXTURE == url.GetProtocolType()) + if(VisualUrl::TEXTURE == url.GetProtocolType()) { std::string location = url.GetLocation(); - if( location.size() > 0u ) + if(location.size() > 0u) { - TextureId id = std::stoi( location ); - for( auto&& elem : mExternalTextures ) + TextureId id = std::stoi(location); + for(auto&& elem : mExternalTextures) { - if( elem.textureId == id ) + if(elem.textureId == id) { preMultiplyOnLoad = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; - textureId = elem.textureId; + textureId = elem.textureId; return elem.textureSet; } } } } - else if( synchronousLoading ) + else { - PixelData data; - if( url.IsValid() ) + // For Atlas + if(synchronousLoading && atlasingStatus && imageAtlasManager->CheckAtlasAvailable(url, desiredSize)) { - Devel::PixelBuffer pixelBuffer = LoadImageFromFile( url.GetUrl(), desiredSize, fittingMode, samplingMode, - orientationCorrection ); - if( maskInfo ) + Devel::PixelBuffer pixelBuffer = LoadImageSynchronously(url, desiredSize, fittingMode, samplingMode, orientationCorrection); + + if(maskInfo && maskInfo->mAlphaMaskUrl.IsValid()) { - Devel::PixelBuffer maskPixelBuffer = LoadImageFromFile( maskInfo->mAlphaMaskUrl.GetUrl(), ImageDimensions(), - FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, true ); - if( maskPixelBuffer ) + Devel::PixelBuffer maskPixelBuffer = LoadImageSynchronously(maskInfo->mAlphaMaskUrl.GetUrl(), ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, true); + if(maskPixelBuffer) { - pixelBuffer.ApplyMask( maskPixelBuffer, maskInfo->mContentScaleFactor, maskInfo->mCropToMask ); + pixelBuffer.ApplyMask(maskPixelBuffer, maskInfo->mContentScaleFactor, maskInfo->mCropToMask); } } - if( pixelBuffer ) + + PixelData data; + if(pixelBuffer) { - PreMultiply( pixelBuffer, preMultiplyOnLoad ); + PreMultiply(pixelBuffer, preMultiplyOnLoad); data = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer + + if(data) + { + textureSet = imageAtlasManager->Add(textureRect, data); + if(textureSet) + { + textureRectSize.SetWidth(data.GetWidth()); + textureRectSize.SetHeight(data.GetHeight()); + } + } + else + { + DALI_LOG_ERROR("TextureManager::LoadTexture: Synchronous Texture loading with atlasing is failed.\n"); + } } - } - if( !data ) - { - // use broken image - textureSet = TextureSet::New(); - Devel::PixelBuffer pixelBuffer = LoadImageFromFile( mBrokenImageUrl ); - if( pixelBuffer ) + if(!textureSet) { - PreMultiply( pixelBuffer, preMultiplyOnLoad ); - data = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer + atlasingStatus = false; } - Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, data.GetPixelFormat(), - data.GetWidth(), data.GetHeight() ); - texture.Upload( data ); - textureSet = TextureSet::New(); - textureSet.SetTexture( 0u, texture ); } - else + + if(!textureSet) { - if( atlasingStatus ) // attempt atlasing + loadingStatus = true; + if(atlasingStatus) { - textureSet = imageAtlasManager->Add( textureRect, data ); + textureSet = imageAtlasManager->Add(textureRect, url.GetUrl(), desiredSize, fittingMode, true, atlasObserver); } - if( !textureSet ) // big image, no atlasing or atlasing failed + if(!textureSet) // big image, no atlasing or atlasing failed { atlasingStatus = false; - Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, data.GetPixelFormat(), - data.GetWidth(), data.GetHeight() ); - texture.Upload( data ); - textureSet = TextureSet::New(); - textureSet.SetTexture( 0u, texture ); + if(!maskInfo || !maskInfo->mAlphaMaskUrl.IsValid()) + { + textureId = RequestLoad(url, desiredSize, fittingMode, samplingMode, TextureManager::NO_ATLAS, textureObserver, orientationCorrection, reloadPolicy, preMultiplyOnLoad, synchronousLoading); + } + else + { + maskInfo->mAlphaMaskId = RequestMaskLoad(maskInfo->mAlphaMaskUrl, synchronousLoading); + textureId = RequestLoad(url, + maskInfo->mAlphaMaskId, + maskInfo->mContentScaleFactor, + desiredSize, + fittingMode, + samplingMode, + TextureManager::NO_ATLAS, + maskInfo->mCropToMask, + textureObserver, + orientationCorrection, + reloadPolicy, + preMultiplyOnLoad, + synchronousLoading); + } + + TextureManager::LoadState loadState = GetTextureStateInternal(textureId); + if(loadState == TextureManager::LoadState::UPLOADED) + { + // UploadComplete has already been called - keep the same texture set + textureSet = GetTextureSet(textureId); + } + + // If we are loading the texture, or waiting for the ready signal handler to complete, inform + // caller that they need to wait. + loadingStatus = (loadState == TextureManager::LoadState::LOADING || + loadState == TextureManager::LoadState::WAITING_FOR_MASK || + loadState == TextureManager::LoadState::MASK_APPLYING || + loadState == TextureManager::LoadState::MASK_APPLIED || + loadState == TextureManager::LoadState::NOT_STARTED || + mQueueLoadFlag); } else { - textureRectSize.SetWidth(data.GetWidth()); - textureRectSize.SetHeight(data.GetHeight()); + textureRectSize = desiredSize; } } } - else - { - loadingStatus = true; - if( atlasingStatus ) - { - textureSet = imageAtlasManager->Add( textureRect, url.GetUrl(), desiredSize, fittingMode, true, atlasObserver); - } - if( !textureSet ) // big image, no atlasing or atlasing failed - { - atlasingStatus = false; - if( !maskInfo ) - { - textureId = RequestLoad( url, desiredSize, fittingMode, samplingMode, TextureManager::NO_ATLAS, - textureObserver, orientationCorrection, reloadPolicy, preMultiplyOnLoad ); - } - else - { - maskInfo->mAlphaMaskId = RequestMaskLoad( maskInfo->mAlphaMaskUrl ); - textureId = RequestLoad( url, - maskInfo->mAlphaMaskId, - maskInfo->mContentScaleFactor, - desiredSize, - fittingMode, samplingMode, - TextureManager::NO_ATLAS, - maskInfo->mCropToMask, - textureObserver, - orientationCorrection, - reloadPolicy, preMultiplyOnLoad ); - } - - TextureManager::LoadState loadState = GetTextureStateInternal( textureId ); - if( loadState == TextureManager::UPLOADED ) - { - // UploadComplete has already been called - keep the same texture set - textureSet = GetTextureSet( textureId ); - } - - // If we are loading the texture, or waiting for the ready signal handler to complete, inform - // caller that they need to wait. - loadingStatus = ( loadState == TextureManager::LOADING || - loadState == TextureManager::WAITING_FOR_MASK || - loadState == TextureManager::MASK_APPLYING || - loadState == TextureManager::MASK_APPLIED || - loadState == TextureManager::NOT_STARTED || - mQueueLoadFlag ); - } - else - { - textureRectSize = desiredSize; - } + if(!atlasingStatus && textureSet) + { + Sampler sampler = Sampler::New(); + sampler.SetWrapMode(wrapModeU, wrapModeV); + textureSet.SetSampler(0u, sampler); } - if( ! atlasingStatus && textureSet ) + if(synchronousLoading) { - Sampler sampler = Sampler::New(); - sampler.SetWrapMode( wrapModeU, wrapModeV ); - textureSet.SetSampler( 0u, sampler ); + loadingStatus = false; } return textureSet; @@ -307,11 +374,10 @@ TextureManager::TextureId TextureManager::RequestLoad( TextureUploadObserver* observer, bool orientationCorrection, TextureManager::ReloadPolicy reloadPolicy, - TextureManager::MultiplyOnLoad& preMultiplyOnLoad ) + TextureManager::MultiplyOnLoad& preMultiplyOnLoad, + bool synchronousLoading) { - return RequestLoadInternal( url, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, useAtlas, - false, UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, - preMultiplyOnLoad ); + return RequestLoadInternal(url, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, useAtlas, false, StorageType::UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u, synchronousLoading); } TextureManager::TextureId TextureManager::RequestLoad( @@ -326,20 +392,17 @@ TextureManager::TextureId TextureManager::RequestLoad( TextureUploadObserver* observer, bool orientationCorrection, TextureManager::ReloadPolicy reloadPolicy, - TextureManager::MultiplyOnLoad& preMultiplyOnLoad ) + TextureManager::MultiplyOnLoad& preMultiplyOnLoad, + bool synchronousLoading) { - return RequestLoadInternal( url, maskTextureId, contentScale, desiredSize, fittingMode, samplingMode, useAtlas, - cropToMask, UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, - preMultiplyOnLoad ); + return RequestLoadInternal(url, maskTextureId, contentScale, desiredSize, fittingMode, samplingMode, useAtlas, cropToMask, StorageType::UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, preMultiplyOnLoad, Dali::AnimatedImageLoading(), 0u, synchronousLoading); } -TextureManager::TextureId TextureManager::RequestMaskLoad( const VisualUrl& maskUrl ) +TextureManager::TextureId TextureManager::RequestMaskLoad(const VisualUrl& maskUrl, bool synchronousLoading) { // Use the normal load procedure to get the alpha mask. auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; - return RequestLoadInternal( maskUrl, INVALID_TEXTURE_ID, 1.0f, ImageDimensions(), FittingMode::SCALE_TO_FILL, - SamplingMode::NO_FILTER, NO_ATLAS, false, KEEP_PIXEL_BUFFER, NULL, true, - TextureManager::ReloadPolicy::CACHED, preMultiply ); + return RequestLoadInternal(maskUrl, INVALID_TEXTURE_ID, 1.0f, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, NO_ATLAS, false, StorageType::KEEP_PIXEL_BUFFER, NULL, true, TextureManager::ReloadPolicy::CACHED, preMultiply, Dali::AnimatedImageLoading(), 0u, synchronousLoading); } TextureManager::TextureId TextureManager::RequestLoadInternal( @@ -355,151 +418,229 @@ TextureManager::TextureId TextureManager::RequestLoadInternal( TextureUploadObserver* observer, bool orientationCorrection, TextureManager::ReloadPolicy reloadPolicy, - TextureManager::MultiplyOnLoad& preMultiplyOnLoad) + TextureManager::MultiplyOnLoad& preMultiplyOnLoad, + Dali::AnimatedImageLoading animatedImageLoading, + uint32_t frameIndex, + bool synchronousLoading) { // First check if the requested Texture is cached. - const TextureHash textureHash = GenerateHash( url.GetUrl(), desiredSize, fittingMode, samplingMode, useAtlas, - maskTextureId ); + bool isAnimatedImage = (animatedImageLoading) ? true : false; - TextureManager::TextureId textureId = INVALID_TEXTURE_ID; + TextureHash textureHash = INITIAL_CACHE_NUMBER; + int cacheIndex = INVALID_CACHE_INDEX; + if(storageType != StorageType::RETURN_PIXEL_BUFFER && !isAnimatedImage) + { + textureHash = GenerateHash(url.GetUrl(), desiredSize, fittingMode, samplingMode, useAtlas, maskTextureId); - // Look up the texture by hash. Note: The extra parameters are used in case of a hash collision. - int cacheIndex = FindCachedTexture( textureHash, url.GetUrl(), desiredSize, fittingMode, samplingMode, useAtlas, - maskTextureId, preMultiplyOnLoad ); + // Look up the texture by hash. Note: The extra parameters are used in case of a hash collision. + cacheIndex = FindCachedTexture(textureHash, url.GetUrl(), desiredSize, fittingMode, samplingMode, useAtlas, maskTextureId, preMultiplyOnLoad); + } + TextureManager::TextureId textureId = INVALID_TEXTURE_ID; // Check if the requested Texture exists in the cache. - if( cacheIndex != INVALID_CACHE_INDEX ) + if(cacheIndex != INVALID_CACHE_INDEX) { - if ( TextureManager::ReloadPolicy::CACHED == reloadPolicy ) + if(TextureManager::ReloadPolicy::CACHED == reloadPolicy) { // Mark this texture being used by another client resource. Forced reload would replace the current texture // without the need for incrementing the reference count. - ++( mTextureInfoContainer[ cacheIndex ].referenceCount ); + ++(mTextureInfoContainer[cacheIndex].referenceCount); } - textureId = mTextureInfoContainer[ cacheIndex ].textureId; + textureId = mTextureInfoContainer[cacheIndex].textureId; // Update preMultiplyOnLoad value. It should be changed according to preMultiplied value of the cached info. - preMultiplyOnLoad = mTextureInfoContainer[ cacheIndex ].preMultiplied ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; + preMultiplyOnLoad = mTextureInfoContainer[cacheIndex].preMultiplied ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) Using cached texture id@%d, textureId=%d\n", - url.GetUrl().c_str(), observer, cacheIndex, textureId ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) Using cached texture id@%d, textureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex, textureId); } - if( textureId == INVALID_TEXTURE_ID ) // There was no caching, or caching not required + if(textureId == INVALID_TEXTURE_ID) // There was no caching, or caching not required { - // We need a new Texture. - textureId = GenerateUniqueTextureId(); - bool preMultiply = ( preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD ); - mTextureInfoContainer.push_back( TextureInfo( textureId, maskTextureId, url.GetUrl(), - desiredSize, contentScale, fittingMode, samplingMode, - false, cropToMask, useAtlas, textureHash, orientationCorrection, - preMultiply ) ); + if(VisualUrl::BUFFER == url.GetProtocolType()) + { + std::string location = url.GetLocation(); + if(location.size() > 0u) + { + TextureId targetId = std::stoi(location); + const EncodedImageBuffer& encodedImageBuffer = GetEncodedImageBuffer(targetId); + if(encodedImageBuffer) + { + textureId = targetId; + + // Increase EncodedImageBuffer reference during it contains mTextureInfoContainer. + UseExternalResource(url.GetUrl()); + } + } + } + + if(textureId == INVALID_TEXTURE_ID) + { + textureId = GenerateUniqueTextureId(); + } + + bool preMultiply = (preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD); + mTextureInfoContainer.push_back(TextureInfo(textureId, maskTextureId, url, desiredSize, contentScale, fittingMode, samplingMode, false, cropToMask, useAtlas, textureHash, orientationCorrection, preMultiply, animatedImageLoading, frameIndex)); cacheIndex = mTextureInfoContainer.size() - 1u; - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) New texture, cacheIndex:%d, textureId=%d\n", - url.GetUrl().c_str(), observer, cacheIndex, textureId ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) New texture, cacheIndex:%d, textureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex, textureId); } // The below code path is common whether we are using the cache or not. // The textureInfoIndex now refers to either a pre-existing cached TextureInfo, // or a new TextureInfo just created. - TextureInfo& textureInfo( mTextureInfoContainer[ cacheIndex ] ); - textureInfo.maskTextureId = maskTextureId; - textureInfo.storageType = storageType; + TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex]); + textureInfo.maskTextureId = maskTextureId; + textureInfo.storageType = storageType; textureInfo.orientationCorrection = orientationCorrection; - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::General, "TextureInfo loadState:%s\n", - GET_LOAD_STATE_STRING(textureInfo.loadState ) ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, "TextureInfo loadState:%s\n", GET_LOAD_STATE_STRING(textureInfo.loadState)); // Force reloading of texture by setting loadState unless already loading or cancelled. - if ( TextureManager::ReloadPolicy::FORCED == reloadPolicy && - TextureManager::LOADING != textureInfo.loadState && - TextureManager::WAITING_FOR_MASK != textureInfo.loadState && - TextureManager::MASK_APPLYING != textureInfo.loadState && - TextureManager::MASK_APPLIED != textureInfo.loadState && - TextureManager::CANCELLED != textureInfo.loadState ) + if(TextureManager::ReloadPolicy::FORCED == reloadPolicy && + TextureManager::LoadState::LOADING != textureInfo.loadState && + TextureManager::LoadState::WAITING_FOR_MASK != textureInfo.loadState && + TextureManager::LoadState::MASK_APPLYING != textureInfo.loadState && + TextureManager::LoadState::MASK_APPLIED != textureInfo.loadState && + TextureManager::LoadState::CANCELLED != textureInfo.loadState) { - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Verbose, "TextureManager::RequestLoad( url=%s observer=%p ) ForcedReload cacheIndex:%d, textureId=%d\n", - url.GetUrl().c_str(), observer, cacheIndex, textureId ); - textureInfo.loadState = TextureManager::NOT_STARTED; + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Verbose, "TextureManager::RequestLoad( url=%s observer=%p ) ForcedReload cacheIndex:%d, textureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex, textureId); + + textureInfo.loadState = TextureManager::LoadState::NOT_STARTED; } - // Check if we should add the observer. - // Only do this if we have not loaded yet and it will not have loaded by the end of this method. - switch( textureInfo.loadState ) + if(!synchronousLoading) { - case TextureManager::LOAD_FAILED: // Failed notifies observer which then stops observing. - case TextureManager::NOT_STARTED: + // Check if we should add the observer. + // Only do this if we have not loaded yet and it will not have loaded by the end of this method. + switch(textureInfo.loadState) { - LoadOrQueueTexture( textureInfo, observer ); // If called inside NotifyObservers, queues until afterwards - break; + case TextureManager::LoadState::LOAD_FAILED: // Failed notifies observer which then stops observing. + case TextureManager::LoadState::NOT_STARTED: + { + LoadOrQueueTexture(textureInfo, observer); // If called inside NotifyObservers, queues until afterwards + break; + } + case TextureManager::LoadState::LOADING: + case TextureManager::LoadState::WAITING_FOR_MASK: + case TextureManager::LoadState::MASK_APPLYING: + case TextureManager::LoadState::MASK_APPLIED: + { + ObserveTexture(textureInfo, observer); + break; + } + case TextureManager::LoadState::UPLOADED: + { + if(observer) + { + LoadOrQueueTexture(textureInfo, observer); + } + break; + } + case TextureManager::LoadState::CANCELLED: + { + // A cancelled texture hasn't finished loading yet. Treat as a loading texture + // (it's ref count has already been incremented, above) + textureInfo.loadState = TextureManager::LoadState::LOADING; + ObserveTexture(textureInfo, observer); + break; + } + case TextureManager::LoadState::LOAD_FINISHED: + { + // Loading has already completed. + if(observer && textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER) + { + LoadOrQueueTexture(textureInfo, observer); + } + break; + } } - case TextureManager::LOADING: - case TextureManager::WAITING_FOR_MASK: - case TextureManager::MASK_APPLYING: - case TextureManager::MASK_APPLIED: + } + else + { + // If the image is already finished to load, use cached texture. + // We don't need to consider Observer becaouse this is synchronous loading. + if(textureInfo.loadState == TextureManager::LoadState::UPLOADED || + textureInfo.loadState == TextureManager::LoadState::LOAD_FINISHED) { - ObserveTexture( textureInfo, observer ); - break; + return textureId; } - case TextureManager::UPLOADED: + else { - if( observer ) + Devel::PixelBuffer pixelBuffer = LoadImageSynchronously(url, desiredSize, fittingMode, samplingMode, orientationCorrection);; + + if(!pixelBuffer) { - LoadOrQueueTexture( textureInfo, observer ); + // If pixelBuffer loading is failed in synchronously, call Remove() method. + Remove(textureId, nullptr); + return INVALID_TEXTURE_ID; + } + + if(storageType == StorageType::KEEP_PIXEL_BUFFER) // For the mask image loading. + { + textureInfo.pixelBuffer = pixelBuffer; // Store the pixel data + textureInfo.loadState = LoadState::LOAD_FINISHED; + } + else // For the image loading. + { + if(maskTextureId != INVALID_TEXTURE_ID) + { + int maskCacheIndex = GetCacheIndexFromId(maskTextureId); + if(maskCacheIndex != INVALID_CACHE_INDEX) + { + Devel::PixelBuffer maskPixelBuffer = mTextureInfoContainer[maskCacheIndex].pixelBuffer; + if(maskPixelBuffer) + { + pixelBuffer.ApplyMask(maskPixelBuffer, contentScale, cropToMask); + } + } + else + { + DALI_LOG_ERROR("Mask image is not stored in cache.\n"); + } + } + PreMultiply(pixelBuffer, preMultiplyOnLoad); + + // Upload texture + UploadTexture(pixelBuffer, textureInfo); } - break; - } - case TextureManager::CANCELLED: - { - // A cancelled texture hasn't finished loading yet. Treat as a loading texture - // (it's ref count has already been incremented, above) - textureInfo.loadState = TextureManager::LOADING; - ObserveTexture( textureInfo, observer ); - break; } - case TextureManager::LOAD_FINISHED: - // Loading has already completed. Do nothing. - break; } // Return the TextureId for which this Texture can now be referenced by externally. return textureId; } -void TextureManager::Remove( const TextureManager::TextureId textureId, TextureUploadObserver* observer ) +void TextureManager::Remove(const TextureManager::TextureId textureId, TextureUploadObserver* observer) { - int textureInfoIndex = GetCacheIndexFromId( textureId ); - if( textureInfoIndex != INVALID_INDEX ) + int textureInfoIndex = GetCacheIndexFromId(textureId); + + if(textureInfoIndex != INVALID_INDEX) { - TextureInfo& textureInfo( mTextureInfoContainer[ textureInfoIndex ] ); + TextureInfo& textureInfo(mTextureInfoContainer[textureInfoIndex]); - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, - "TextureManager::Remove(%d) url:%s\n cacheIdx:%d loadState:%s reference count = %d\n", - textureId, textureInfo.url.GetUrl().c_str(), - textureInfoIndex, GET_LOAD_STATE_STRING( textureInfo.loadState ), textureInfo.referenceCount ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::Remove(%d) url:%s\n cacheIdx:%d loadState:%s reference count = %d\n", textureId, textureInfo.url.GetUrl().c_str(), textureInfoIndex, GET_LOAD_STATE_STRING(textureInfo.loadState), textureInfo.referenceCount); // Decrement the reference count and check if this is the last user of this Texture. - if( --textureInfo.referenceCount <= 0 ) + if(--textureInfo.referenceCount <= 0) { // This is the last remove for this Texture. textureInfo.referenceCount = 0; - bool removeTextureInfo = false; + bool removeTextureInfo = false; // If loaded, we can remove the TextureInfo and the Atlas (if atlased). - if( textureInfo.loadState == UPLOADED ) + if(textureInfo.loadState == LoadState::UPLOADED) { - if( textureInfo.atlas ) + if(textureInfo.atlas) { - textureInfo.atlas.Remove( textureInfo.atlasRect ); + textureInfo.atlas.Remove(textureInfo.atlasRect); } removeTextureInfo = true; } - else if( textureInfo.loadState == LOADING ) + else if(textureInfo.loadState == LoadState::LOADING) { // We mark the textureInfo for removal. // Once the load has completed, this method will be called again. - textureInfo.loadState = CANCELLED; + textureInfo.loadState = LoadState::CANCELLED; } else { @@ -508,21 +649,27 @@ void TextureManager::Remove( const TextureManager::TextureId textureId, TextureU } // If the state allows us to remove the TextureInfo data, we do so. - if( removeTextureInfo ) + if(removeTextureInfo) { + // If url location is BUFFER, decrease reference count of EncodedImageBuffer. + if(textureInfo.url.IsBufferResource()) + { + RemoveExternalEncodedImageBuffer(textureInfo.url.GetUrl()); + } // Permanently remove the textureInfo struct. - mTextureInfoContainer.erase( mTextureInfoContainer.begin() + textureInfoIndex ); + mTextureInfoContainer.erase(mTextureInfoContainer.begin() + textureInfoIndex); } } - if( observer ) + if(observer) { // Remove element from the LoadQueue - for( auto&& element : mLoadQueue ) + for(auto&& element : mLoadQueue) { - if( element.mObserver == observer ) + if(element.mObserver == observer) { - mLoadQueue.Erase( &element ); + // Do not erase the item. We will clear it later in ProcessQueuedTextures(). + element.mObserver = nullptr; break; } } @@ -530,37 +677,36 @@ void TextureManager::Remove( const TextureManager::TextureId textureId, TextureU } } -VisualUrl TextureManager::GetVisualUrl( TextureId textureId ) +VisualUrl TextureManager::GetVisualUrl(TextureId textureId) { VisualUrl visualUrl(""); - int cacheIndex = GetCacheIndexFromId( textureId ); + int cacheIndex = GetCacheIndexFromId(textureId); - if( cacheIndex != INVALID_CACHE_INDEX ) + if(cacheIndex != INVALID_CACHE_INDEX) { - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "TextureManager::GetVisualUrl. Using cached texture id=%d, textureId=%d\n", - cacheIndex, textureId ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::GetVisualUrl. Using cached texture id=%d, textureId=%d\n", cacheIndex, textureId); - TextureInfo& cachedTextureInfo( mTextureInfoContainer[ cacheIndex ] ); + TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex]); visualUrl = cachedTextureInfo.url; } return visualUrl; } -TextureManager::LoadState TextureManager::GetTextureState( TextureId textureId ) +TextureManager::LoadState TextureManager::GetTextureState(TextureId textureId) { - LoadState loadState = TextureManager::NOT_STARTED; + LoadState loadState = TextureManager::LoadState::NOT_STARTED; - int cacheIndex = GetCacheIndexFromId( textureId ); - if( cacheIndex != INVALID_CACHE_INDEX ) + int cacheIndex = GetCacheIndexFromId(textureId); + if(cacheIndex != INVALID_CACHE_INDEX) { - TextureInfo& cachedTextureInfo( mTextureInfoContainer[ cacheIndex ] ); + TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex]); loadState = cachedTextureInfo.loadState; } else { - for( auto&& elem : mExternalTextures ) + for(auto&& elem : mExternalTextures) { - if( elem.textureId == textureId ) + if(elem.textureId == textureId) { loadState = LoadState::UPLOADED; break; @@ -570,35 +716,57 @@ TextureManager::LoadState TextureManager::GetTextureState( TextureId textureId ) return loadState; } -TextureManager::LoadState TextureManager::GetTextureStateInternal( TextureId textureId ) +TextureManager::LoadState TextureManager::GetTextureStateInternal(TextureId textureId) { - LoadState loadState = TextureManager::NOT_STARTED; + LoadState loadState = TextureManager::LoadState::NOT_STARTED; - int cacheIndex = GetCacheIndexFromId( textureId ); - if( cacheIndex != INVALID_CACHE_INDEX ) + int cacheIndex = GetCacheIndexFromId(textureId); + if(cacheIndex != INVALID_CACHE_INDEX) { - TextureInfo& cachedTextureInfo( mTextureInfoContainer[ cacheIndex ] ); + TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex]); loadState = cachedTextureInfo.loadState; } return loadState; } -TextureSet TextureManager::GetTextureSet( TextureId textureId ) +Devel::PixelBuffer TextureManager::LoadImageSynchronously(const VisualUrl& url, + const ImageDimensions desiredSize, + FittingMode::Type fittingMode, + Dali::SamplingMode::Type samplingMode, + bool orientationCorrection) +{ + Devel::PixelBuffer pixelBuffer; + if(url.IsBufferResource()) + { + const EncodedImageBuffer& encodedImageBuffer = GetEncodedImageBuffer(url.GetUrl()); + if(encodedImageBuffer) + { + pixelBuffer = LoadImageFromBuffer(encodedImageBuffer.GetRawBuffer(), desiredSize, fittingMode, samplingMode, orientationCorrection); + } + } + else + { + pixelBuffer = LoadImageFromFile(url.GetUrl(), desiredSize, fittingMode, samplingMode, orientationCorrection); + } + return pixelBuffer; +} + +TextureSet TextureManager::GetTextureSet(TextureId textureId) { - TextureSet textureSet;// empty handle + TextureSet textureSet; // empty handle - int cacheIndex = GetCacheIndexFromId( textureId ); - if( cacheIndex != INVALID_CACHE_INDEX ) + int cacheIndex = GetCacheIndexFromId(textureId); + if(cacheIndex != INVALID_CACHE_INDEX) { - TextureInfo& cachedTextureInfo( mTextureInfoContainer[ cacheIndex ] ); + TextureInfo& cachedTextureInfo(mTextureInfoContainer[cacheIndex]); textureSet = cachedTextureInfo.textureSet; } else { - for( auto&& elem : mExternalTextures ) + for(auto&& elem : mExternalTextures) { - if( elem.textureId == textureId ) + if(elem.textureId == textureId) { textureSet = elem.textureSet; break; @@ -608,34 +776,83 @@ TextureSet TextureManager::GetTextureSet( TextureId textureId ) return textureSet; } -std::string TextureManager::AddExternalTexture( TextureSet& textureSet ) +EncodedImageBuffer TextureManager::GetEncodedImageBuffer(TextureId textureId) +{ + EncodedImageBuffer encodedImageBuffer; // empty handle + for(auto&& elem : mEncodedBufferTextures) + { + if(elem.textureId == textureId) + { + encodedImageBuffer = elem.encodedImageBuffer; + break; + } + } + return encodedImageBuffer; +} + +EncodedImageBuffer TextureManager::GetEncodedImageBuffer(const std::string& url) +{ + EncodedImageBuffer encodedImageBuffer; // empty handle + if(url.size() > 0 && VisualUrl::BUFFER == VisualUrl::GetProtocolType(url)) + { + std::string location = VisualUrl::GetLocation(url); + if(location.size() > 0u) + { + TextureId targetId = std::stoi(location); + return GetEncodedImageBuffer(targetId); + } + } + return encodedImageBuffer; +} + +std::string TextureManager::AddExternalTexture(TextureSet& textureSet) { TextureManager::ExternalTextureInfo info; - info.textureId = GenerateUniqueTextureId(); + info.textureId = GenerateUniqueTextureId(); info.textureSet = textureSet; - mExternalTextures.emplace_back( info ); - return VisualUrl::CreateTextureUrl( std::to_string( info.textureId ) ); + mExternalTextures.emplace_back(info); + + return VisualUrl::CreateTextureUrl(std::to_string(info.textureId)); } -TextureSet TextureManager::RemoveExternalTexture( const std::string& url ) +std::string TextureManager::AddExternalEncodedImageBuffer(const EncodedImageBuffer& encodedImageBuffer) { - if( url.size() > 0u ) + // Duplication check + for(auto&& elem : mEncodedBufferTextures) { - // get the location from the Url - VisualUrl parseUrl( url ); - if( VisualUrl::TEXTURE == parseUrl.GetProtocolType() ) + if(elem.encodedImageBuffer == encodedImageBuffer) { - std::string location = parseUrl.GetLocation(); - if( location.size() > 0u ) + // If same buffer added, increase reference count and return. + elem.referenceCount++; + return VisualUrl::CreateBufferUrl(std::to_string(elem.textureId)); + } + } + TextureManager::EncodedBufferTextureInfo info(GenerateUniqueTextureId(), encodedImageBuffer); + mEncodedBufferTextures.emplace_back(info); + return VisualUrl::CreateBufferUrl(std::to_string(info.textureId)); +} + +TextureSet TextureManager::RemoveExternalTexture(const std::string& url) +{ + if(url.size() > 0u) + { + if(VisualUrl::TEXTURE == VisualUrl::GetProtocolType(url)) + { + // get the location from the Url + std::string location = VisualUrl::GetLocation(url); + if(location.size() > 0u) { - TextureId id = std::stoi( location ); + TextureId id = std::stoi(location); const auto end = mExternalTextures.end(); - for( auto iter = mExternalTextures.begin(); iter != end; ++iter ) + for(auto iter = mExternalTextures.begin(); iter != end; ++iter) { - if( iter->textureId == id ) + if(iter->textureId == id) { auto textureSet = iter->textureSet; - mExternalTextures.erase( iter ); + if(--(iter->referenceCount) <= 0) + { + mExternalTextures.erase(iter); + } return textureSet; } } @@ -645,166 +862,236 @@ TextureSet TextureManager::RemoveExternalTexture( const std::string& url ) return TextureSet(); } +EncodedImageBuffer TextureManager::RemoveExternalEncodedImageBuffer(const std::string& url) +{ + if(url.size() > 0u) + { + if(VisualUrl::BUFFER == VisualUrl::GetProtocolType(url)) + { + // get the location from the Url + std::string location = VisualUrl::GetLocation(url); + if(location.size() > 0u) + { + TextureId id = std::stoi(location); + const auto end = mEncodedBufferTextures.end(); + for(auto iter = mEncodedBufferTextures.begin(); iter != end; ++iter) + { + if(iter->textureId == id) + { + auto encodedImageBuffer = iter->encodedImageBuffer; + if(--(iter->referenceCount) <= 0) + { + mEncodedBufferTextures.erase(iter); + } + return encodedImageBuffer; + } + } + } + } + } + return EncodedImageBuffer(); +} + +void TextureManager::UseExternalResource(const VisualUrl& url) +{ + if(VisualUrl::TEXTURE == url.GetProtocolType()) + { + std::string location = url.GetLocation(); + if(location.size() > 0u) + { + TextureId id = std::stoi(location); + for(auto&& elem : mExternalTextures) + { + if(elem.textureId == id) + { + elem.referenceCount++; + return; + } + } + } + } + else if(VisualUrl::BUFFER == url.GetProtocolType()) + { + std::string location = url.GetLocation(); + if(location.size() > 0u) + { + TextureId id = std::stoi(location); + for(auto&& elem : mEncodedBufferTextures) + { + if(elem.textureId == id) + { + elem.referenceCount++; + return; + } + } + } + } +} -void TextureManager::AddObserver( TextureManager::LifecycleObserver& observer ) +void TextureManager::AddObserver(TextureManager::LifecycleObserver& observer) { // make sure an observer doesn't observe the same object twice // otherwise it will get multiple calls to ObjectDestroyed() - DALI_ASSERT_DEBUG( mLifecycleObservers.End() == std::find( mLifecycleObservers.Begin(), mLifecycleObservers.End(), &observer)); - mLifecycleObservers.PushBack( &observer ); + DALI_ASSERT_DEBUG(mLifecycleObservers.End() == std::find(mLifecycleObservers.Begin(), mLifecycleObservers.End(), &observer)); + mLifecycleObservers.PushBack(&observer); } -void TextureManager::RemoveObserver( TextureManager::LifecycleObserver& observer) +void TextureManager::RemoveObserver(TextureManager::LifecycleObserver& observer) { // Find the observer... - auto endIter = mLifecycleObservers.End(); - for( auto iter = mLifecycleObservers.Begin(); iter != endIter; ++iter) + auto endIter = mLifecycleObservers.End(); + for(auto iter = mLifecycleObservers.Begin(); iter != endIter; ++iter) { - if( (*iter) == &observer) + if((*iter) == &observer) { - mLifecycleObservers.Erase( iter ); + mLifecycleObservers.Erase(iter); break; } } DALI_ASSERT_DEBUG(endIter != mLifecycleObservers.End()); } -void TextureManager::LoadOrQueueTexture( TextureInfo& textureInfo, TextureUploadObserver* observer ) +void TextureManager::LoadOrQueueTexture(TextureInfo& textureInfo, TextureUploadObserver* observer) { - switch( textureInfo.loadState ) + switch(textureInfo.loadState) { - case NOT_STARTED: - case LOAD_FAILED: + case LoadState::NOT_STARTED: + case LoadState::LOAD_FAILED: { - if( mQueueLoadFlag ) + if(mQueueLoadFlag) { - QueueLoadTexture( textureInfo, observer ); + QueueLoadTexture(textureInfo, observer); } else { - LoadTexture( textureInfo, observer ); + LoadTexture(textureInfo, observer); } break; } - case UPLOADED: + case LoadState::UPLOADED: { - if( mQueueLoadFlag ) + if(mQueueLoadFlag) { - QueueLoadTexture( textureInfo, observer ); + QueueLoadTexture(textureInfo, observer); } else { // The Texture has already loaded. The other observers have already been notified. // We need to send a "late" loaded notification for this observer. - observer->UploadComplete( true, textureInfo.textureId, textureInfo.textureSet, - textureInfo.useAtlas, textureInfo.atlasRect, - textureInfo.preMultiplied ); + observer->UploadComplete(true, textureInfo.textureId, textureInfo.textureSet, textureInfo.useAtlas, textureInfo.atlasRect, textureInfo.preMultiplied); } break; } - case LOADING: - case CANCELLED: - case LOAD_FINISHED: - case WAITING_FOR_MASK: - case MASK_APPLYING: - case MASK_APPLIED: + case LoadState::LOADING: + case LoadState::CANCELLED: + case LoadState::LOAD_FINISHED: + case LoadState::WAITING_FOR_MASK: + case LoadState::MASK_APPLYING: + case LoadState::MASK_APPLIED: { break; } } } -void TextureManager::QueueLoadTexture( TextureInfo& textureInfo, TextureUploadObserver* observer ) +void TextureManager::QueueLoadTexture(TextureInfo& textureInfo, TextureUploadObserver* observer) { auto textureId = textureInfo.textureId; - mLoadQueue.PushBack( LoadQueueElement( textureId, observer) ); + mLoadQueue.PushBack(LoadQueueElement(textureId, observer)); + + observer->DestructionSignal().Connect(this, &TextureManager::ObserverDestroyed); } -void TextureManager::LoadTexture( TextureInfo& textureInfo, TextureUploadObserver* observer ) +void TextureManager::LoadTexture(TextureInfo& textureInfo, TextureUploadObserver* observer) { - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "TextureManager::LoadTexture(): url:%s sync:%s\n", - textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously?"T":"F" ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::LoadTexture(): url:%s sync:%s\n", textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously ? "T" : "F"); - textureInfo.loadState = LOADING; - if( !textureInfo.loadSynchronously ) + textureInfo.loadState = LoadState::LOADING; + if(!textureInfo.loadSynchronously) { - auto& loadersContainer = textureInfo.url.IsLocalResource() ? mAsyncLocalLoaders : mAsyncRemoteLoaders; - auto loadingHelperIt = loadersContainer.GetNext(); - auto premultiplyOnLoad = ( textureInfo.preMultiplyOnLoad && textureInfo.maskTextureId == INVALID_TEXTURE_ID ) ? - DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF; + auto& loadersContainer = (textureInfo.url.IsLocalResource() || textureInfo.url.IsBufferResource()) ? mAsyncLocalLoaders : mAsyncRemoteLoaders; + auto loadingHelperIt = loadersContainer.GetNext(); + auto premultiplyOnLoad = (textureInfo.preMultiplyOnLoad && textureInfo.maskTextureId == INVALID_TEXTURE_ID) ? DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF; DALI_ASSERT_ALWAYS(loadingHelperIt != loadersContainer.End()); - loadingHelperIt->Load(textureInfo.textureId, textureInfo.url, - textureInfo.desiredSize, textureInfo.fittingMode, - textureInfo.samplingMode, textureInfo.orientationCorrection, - premultiplyOnLoad ); + if(textureInfo.animatedImageLoading) + { + loadingHelperIt->LoadAnimatedImage(textureInfo.textureId, textureInfo.animatedImageLoading, textureInfo.frameIndex); + } + else + { + loadingHelperIt->Load(textureInfo.textureId, textureInfo.url, textureInfo.desiredSize, textureInfo.fittingMode, textureInfo.samplingMode, textureInfo.orientationCorrection, premultiplyOnLoad); + } } - ObserveTexture( textureInfo, observer ); + ObserveTexture(textureInfo, observer); } void TextureManager::ProcessQueuedTextures() { - for( auto&& element : mLoadQueue ) + for(auto&& element : mLoadQueue) { - int cacheIndex = GetCacheIndexFromId( element.mTextureId ); - if( cacheIndex != INVALID_CACHE_INDEX ) + if(!element.mObserver) + { + continue; + } + + int cacheIndex = GetCacheIndexFromId(element.mTextureId); + if(cacheIndex != INVALID_CACHE_INDEX) { - TextureInfo& textureInfo( mTextureInfoContainer[cacheIndex] ); - if( textureInfo.loadState == UPLOADED ) + TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex]); + if(textureInfo.loadState == LoadState::UPLOADED) { - element.mObserver->UploadComplete( true, textureInfo.textureId, textureInfo.textureSet, - textureInfo.useAtlas, textureInfo.atlasRect, - textureInfo.preMultiplied ); + element.mObserver->UploadComplete(true, textureInfo.textureId, textureInfo.textureSet, textureInfo.useAtlas, textureInfo.atlasRect, textureInfo.preMultiplied); + } + else if(textureInfo.loadState == LoadState::LOAD_FINISHED && textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER) + { + element.mObserver->LoadComplete(true, textureInfo.pixelBuffer, textureInfo.url, textureInfo.preMultiplied); } else { - LoadTexture( textureInfo, element.mObserver ); + LoadTexture(textureInfo, element.mObserver); } } } mLoadQueue.Clear(); } -void TextureManager::ObserveTexture( TextureInfo& textureInfo, - TextureUploadObserver* observer ) +void TextureManager::ObserveTexture(TextureInfo& textureInfo, + TextureUploadObserver* observer) { - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "TextureManager::ObserveTexture(): url:%s observer:%p\n", - textureInfo.url.GetUrl().c_str(), observer ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::ObserveTexture(): url:%s observer:%p\n", textureInfo.url.GetUrl().c_str(), observer); - if( observer ) + if(observer) { - textureInfo.observerList.PushBack( observer ); - observer->DestructionSignal().Connect( this, &TextureManager::ObserverDestroyed ); + textureInfo.observerList.PushBack(observer); + observer->DestructionSignal().Connect(this, &TextureManager::ObserverDestroyed); } } -void TextureManager::AsyncLoadComplete( AsyncLoadingInfoContainerType& loadingContainer, uint32_t id, - Devel::PixelBuffer pixelBuffer ) +void TextureManager::AsyncLoadComplete(AsyncLoadingInfoContainerType& loadingContainer, uint32_t id, Devel::PixelBuffer pixelBuffer) { - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "TextureManager::AsyncLoadComplete( id:%d )\n", id ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::AsyncLoadComplete( id:%d )\n", id); - if( loadingContainer.size() >= 1u ) + if(loadingContainer.size() >= 1u) { AsyncLoadingInfo loadingInfo = loadingContainer.front(); - if( loadingInfo.loadId == id ) + if(loadingInfo.loadId == id) { - int cacheIndex = GetCacheIndexFromId( loadingInfo.textureId ); - if( cacheIndex != INVALID_CACHE_INDEX ) + int cacheIndex = GetCacheIndexFromId(loadingInfo.textureId); + if(cacheIndex != INVALID_CACHE_INDEX) { - TextureInfo& textureInfo( mTextureInfoContainer[cacheIndex] ); + TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex]); - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, - " textureId:%d Url:%s CacheIndex:%d LoadState: %d\n", - textureInfo.textureId, textureInfo.url.GetUrl().c_str(), cacheIndex, textureInfo.loadState ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, " textureId:%d Url:%s CacheIndex:%d LoadState: %d\n", textureInfo.textureId, textureInfo.url.GetUrl().c_str(), cacheIndex, textureInfo.loadState); - if( textureInfo.loadState != CANCELLED ) + if(textureInfo.loadState != LoadState::CANCELLED) { // textureInfo can be invalidated after this call (as the mTextureInfoContainer may be modified) - PostLoad( textureInfo, pixelBuffer ); + PostLoad(textureInfo, pixelBuffer); } else { - Remove( textureInfo.textureId, nullptr ); + Remove(textureInfo.textureId, nullptr); } } } @@ -813,145 +1100,159 @@ void TextureManager::AsyncLoadComplete( AsyncLoadingInfoContainerType& loadingCo } } -void TextureManager::PostLoad( TextureInfo& textureInfo, Devel::PixelBuffer& pixelBuffer ) +void TextureManager::PostLoad(TextureInfo& textureInfo, Devel::PixelBuffer& pixelBuffer) { // Was the load successful? - if( pixelBuffer && ( pixelBuffer.GetWidth() != 0 ) && ( pixelBuffer.GetHeight() != 0 ) ) + if(pixelBuffer && (pixelBuffer.GetWidth() != 0) && (pixelBuffer.GetHeight() != 0)) { // No atlas support for now - textureInfo.useAtlas = NO_ATLAS; + textureInfo.useAtlas = NO_ATLAS; + textureInfo.preMultiplied = pixelBuffer.IsAlphaPreMultiplied(); - if( textureInfo.storageType == UPLOAD_TO_TEXTURE ) + if(textureInfo.storageType == StorageType::UPLOAD_TO_TEXTURE) { // If there is a mask texture ID associated with this texture, then apply the mask // if it's already loaded. If it hasn't, and the mask is still loading, // wait for the mask to finish loading. - if( textureInfo.maskTextureId != INVALID_TEXTURE_ID ) + // note, If the texture is already uploaded synchronously during loading, + // we don't need to apply mask. + if(textureInfo.loadState != LoadState::UPLOADED && + textureInfo.maskTextureId != INVALID_TEXTURE_ID) { - if( textureInfo.loadState == MASK_APPLYING ) + if(textureInfo.loadState == LoadState::MASK_APPLYING) { - textureInfo.loadState = MASK_APPLIED; - UploadTexture( pixelBuffer, textureInfo ); - NotifyObservers( textureInfo, true ); + textureInfo.loadState = LoadState::MASK_APPLIED; + UploadTexture(pixelBuffer, textureInfo); + NotifyObservers(textureInfo, true); } else { - LoadState maskLoadState = GetTextureStateInternal( textureInfo.maskTextureId ); + LoadState maskLoadState = GetTextureStateInternal(textureInfo.maskTextureId); textureInfo.pixelBuffer = pixelBuffer; // Store the pixel buffer temporarily - if( maskLoadState == LOADING ) + if(maskLoadState == LoadState::LOADING) { - textureInfo.loadState = WAITING_FOR_MASK; + textureInfo.loadState = LoadState::WAITING_FOR_MASK; } - else if( maskLoadState == LOAD_FINISHED ) + else if(maskLoadState == LoadState::LOAD_FINISHED) { // Send New Task to Thread - ApplyMask( textureInfo, textureInfo.maskTextureId ); + ApplyMask(textureInfo, textureInfo.maskTextureId); } } } else { - UploadTexture( pixelBuffer, textureInfo ); - NotifyObservers( textureInfo, true ); + UploadTexture(pixelBuffer, textureInfo); + NotifyObservers(textureInfo, true); } } else { textureInfo.pixelBuffer = pixelBuffer; // Store the pixel data - textureInfo.loadState = LOAD_FINISHED; + textureInfo.loadState = LoadState::LOAD_FINISHED; - // Check if there was another texture waiting for this load to complete - // (e.g. if this was an image mask, and its load is on a different thread) - CheckForWaitingTexture( textureInfo ); + if(textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER) + { + NotifyObservers(textureInfo, true); + } + else + { + // Check if there was another texture waiting for this load to complete + // (e.g. if this was an image mask, and its load is on a different thread) + CheckForWaitingTexture(textureInfo); + } } } else { - // @todo If the load was unsuccessful, upload the broken image. - textureInfo.loadState = LOAD_FAILED; - CheckForWaitingTexture( textureInfo ); - NotifyObservers( textureInfo, false ); + textureInfo.loadState = LoadState::LOAD_FAILED; + CheckForWaitingTexture(textureInfo); + NotifyObservers(textureInfo, false); } } -void TextureManager::CheckForWaitingTexture( TextureInfo& maskTextureInfo ) +void TextureManager::CheckForWaitingTexture(TextureInfo& maskTextureInfo) { // Search the cache, checking if any texture has this texture id as a // maskTextureId: const unsigned int size = mTextureInfoContainer.size(); - for( unsigned int cacheIndex = 0; cacheIndex < size; ++cacheIndex ) + for(unsigned int cacheIndex = 0; cacheIndex < size; ++cacheIndex) { - if( mTextureInfoContainer[cacheIndex].maskTextureId == maskTextureInfo.textureId && - mTextureInfoContainer[cacheIndex].loadState == WAITING_FOR_MASK ) + if(mTextureInfoContainer[cacheIndex].maskTextureId == maskTextureInfo.textureId && + mTextureInfoContainer[cacheIndex].loadState == LoadState::WAITING_FOR_MASK) { - TextureInfo& textureInfo( mTextureInfoContainer[cacheIndex] ); + TextureInfo& textureInfo(mTextureInfoContainer[cacheIndex]); - if( maskTextureInfo.loadState == LOAD_FINISHED ) + if(maskTextureInfo.loadState == LoadState::LOAD_FINISHED) { // Send New Task to Thread - ApplyMask( textureInfo, maskTextureInfo.textureId ); + ApplyMask(textureInfo, maskTextureInfo.textureId); } else { textureInfo.pixelBuffer.Reset(); - textureInfo.loadState = LOAD_FAILED; - NotifyObservers( textureInfo, false ); + textureInfo.loadState = LoadState::LOAD_FAILED; + NotifyObservers(textureInfo, false); } } } } -void TextureManager::ApplyMask( TextureInfo& textureInfo, TextureId maskTextureId ) +void TextureManager::ApplyMask(TextureInfo& textureInfo, TextureId maskTextureId) { - int maskCacheIndex = GetCacheIndexFromId( maskTextureId ); - if( maskCacheIndex != INVALID_CACHE_INDEX ) + int maskCacheIndex = GetCacheIndexFromId(maskTextureId); + if(maskCacheIndex != INVALID_CACHE_INDEX) { Devel::PixelBuffer maskPixelBuffer = mTextureInfoContainer[maskCacheIndex].pixelBuffer; - Devel::PixelBuffer pixelBuffer = textureInfo.pixelBuffer; + Devel::PixelBuffer pixelBuffer = textureInfo.pixelBuffer; textureInfo.pixelBuffer.Reset(); - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "TextureManager::ApplyMask(): url:%s sync:%s\n", - textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously?"T":"F" ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "TextureManager::ApplyMask(): url:%s sync:%s\n", textureInfo.url.GetUrl().c_str(), textureInfo.loadSynchronously ? "T" : "F"); - textureInfo.loadState = MASK_APPLYING; - auto& loadersContainer = textureInfo.url.IsLocalResource() ? mAsyncLocalLoaders : mAsyncRemoteLoaders; - auto loadingHelperIt = loadersContainer.GetNext(); - auto premultiplyOnLoad = textureInfo.preMultiplyOnLoad ? DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF; + textureInfo.loadState = LoadState::MASK_APPLYING; + auto& loadersContainer = (textureInfo.url.IsLocalResource() || textureInfo.url.IsBufferResource()) ? mAsyncLocalLoaders : mAsyncRemoteLoaders; + auto loadingHelperIt = loadersContainer.GetNext(); + auto premultiplyOnLoad = textureInfo.preMultiplyOnLoad ? DevelAsyncImageLoader::PreMultiplyOnLoad::ON : DevelAsyncImageLoader::PreMultiplyOnLoad::OFF; DALI_ASSERT_ALWAYS(loadingHelperIt != loadersContainer.End()); - loadingHelperIt->ApplyMask( textureInfo.textureId, pixelBuffer, maskPixelBuffer, textureInfo.scaleFactor, textureInfo.cropToMask, premultiplyOnLoad ); + loadingHelperIt->ApplyMask(textureInfo.textureId, pixelBuffer, maskPixelBuffer, textureInfo.scaleFactor, textureInfo.cropToMask, premultiplyOnLoad); } } -void TextureManager::UploadTexture( Devel::PixelBuffer& pixelBuffer, TextureInfo& textureInfo ) +void TextureManager::UploadTexture(Devel::PixelBuffer& pixelBuffer, TextureInfo& textureInfo) { - if( textureInfo.useAtlas != USE_ATLAS ) + if(textureInfo.loadState != LoadState::UPLOADED && textureInfo.useAtlas != USE_ATLAS) { - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::General, " TextureManager::UploadTexture() New Texture for textureId:%d\n", textureInfo.textureId ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::General, " TextureManager::UploadTexture() New Texture for textureId:%d\n", textureInfo.textureId); // Check if this pixelBuffer is premultiplied textureInfo.preMultiplied = pixelBuffer.IsAlphaPreMultiplied(); - Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, pixelBuffer.GetPixelFormat(), - pixelBuffer.GetWidth(), pixelBuffer.GetHeight() ); + auto& renderingAddOn = RenderingAddOn::Get(); + if(renderingAddOn.IsValid()) + { + renderingAddOn.CreateGeometry(textureInfo.textureId, pixelBuffer); + } + + Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelBuffer.GetPixelFormat(), pixelBuffer.GetWidth(), pixelBuffer.GetHeight()); - PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer ); - texture.Upload( pixelData ); - if ( ! textureInfo.textureSet ) + PixelData pixelData = Devel::PixelBuffer::Convert(pixelBuffer); + texture.Upload(pixelData); + if(!textureInfo.textureSet) { textureInfo.textureSet = TextureSet::New(); } - textureInfo.textureSet.SetTexture( 0u, texture ); + textureInfo.textureSet.SetTexture(0u, texture); } // Update the load state. // Note: This is regardless of success as we care about whether a // load attempt is in progress or not. If unsuccessful, a broken // image is still loaded. - textureInfo.loadState = UPLOADED; + textureInfo.loadState = LoadState::UPLOADED; } -void TextureManager::NotifyObservers( TextureInfo& textureInfo, bool success ) +void TextureManager::NotifyObservers(TextureInfo& textureInfo, bool success) { TextureId textureId = textureInfo.textureId; @@ -961,7 +1262,7 @@ void TextureManager::NotifyObservers( TextureInfo& textureInfo, bool success ) mQueueLoadFlag = true; - while( info->observerList.Count() ) + while(info->observerList.Count()) { TextureUploadObserver* observer = info->observerList[0]; @@ -973,34 +1274,39 @@ void TextureManager::NotifyObservers( TextureInfo& textureInfo, bool success ) // invalidating the reference to the textureInfo struct. // Texture load requests for the same URL are deferred until the end of this // method. - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "NotifyObservers() url:%s loadState:%s\n", - textureInfo.url.GetUrl().c_str(), GET_LOAD_STATE_STRING(textureInfo.loadState ) ); + DALI_LOG_INFO(gTextureManagerLogFilter, Debug::Concise, "NotifyObservers() url:%s loadState:%s\n", textureInfo.url.GetUrl().c_str(), GET_LOAD_STATE_STRING(textureInfo.loadState)); - observer->UploadComplete( success, info->textureId, info->textureSet, info->useAtlas, info->atlasRect, - info->preMultiplied ); - observer->DestructionSignal().Disconnect( this, &TextureManager::ObserverDestroyed ); + // It is possible for the observer to be deleted. + // Disconnect and remove the observer first. + observer->DestructionSignal().Disconnect(this, &TextureManager::ObserverDestroyed); - // Get the textureInfo from the container again as it may have been invalidated. - int textureInfoIndex = GetCacheIndexFromId( textureId ); - if( textureInfoIndex == INVALID_CACHE_INDEX) + info->observerList.Erase(info->observerList.begin()); + + if(info->storageType == StorageType::RETURN_PIXEL_BUFFER) { - break; // texture has been removed - can stop. + observer->LoadComplete(success, info->pixelBuffer, info->url, info->preMultiplied); + } + else + { + observer->UploadComplete(success, info->textureId, info->textureSet, info->useAtlas, info->atlasRect, info->preMultiplied); } - info = &mTextureInfoContainer[ textureInfoIndex ]; - // remove the observer that was just triggered if it's still in the list - for( TextureInfo::ObserverListType::Iterator j = info->observerList.Begin(); j != info->observerList.End(); ++j ) + // Get the textureInfo from the container again as it may have been invalidated. + int textureInfoIndex = GetCacheIndexFromId(textureId); + if(textureInfoIndex == INVALID_CACHE_INDEX) { - if( *j == observer ) - { - info->observerList.Erase( j ); - break; - } + break; // texture has been removed - can stop. } + info = &mTextureInfoContainer[textureInfoIndex]; } mQueueLoadFlag = false; ProcessQueuedTextures(); + + if(info->storageType == StorageType::RETURN_PIXEL_BUFFER && info->observerList.Count() == 0) + { + Remove(info->textureId, nullptr); + } } TextureManager::TextureId TextureManager::GenerateUniqueTextureId() @@ -1008,13 +1314,13 @@ TextureManager::TextureId TextureManager::GenerateUniqueTextureId() return mCurrentTextureId++; } -int TextureManager::GetCacheIndexFromId( const TextureId textureId ) +int TextureManager::GetCacheIndexFromId(const TextureId textureId) { const unsigned int size = mTextureInfoContainer.size(); - for( unsigned int i = 0; i < size; ++i ) + for(unsigned int i = 0; i < size; ++i) { - if( mTextureInfoContainer[i].textureId == textureId ) + if(mTextureInfoContainer[i].textureId == textureId) { return i; } @@ -1029,67 +1335,67 @@ TextureManager::TextureHash TextureManager::GenerateHash( const FittingMode::Type fittingMode, const Dali::SamplingMode::Type samplingMode, const UseAtlas useAtlas, - TextureId maskTextureId ) + TextureId maskTextureId) { - std::string hashTarget( url ); - const size_t urlLength = hashTarget.length(); - const uint16_t width = size.GetWidth(); - const uint16_t height = size.GetWidth(); + std::string hashTarget(url); + const size_t urlLength = hashTarget.length(); + const uint16_t width = size.GetWidth(); + const uint16_t height = size.GetWidth(); // If either the width or height has been specified, include the resizing options in the hash - if( width != 0 || height != 0 ) + if(width != 0 || height != 0) { // We are appending 5 bytes to the URL to form the hash input. - hashTarget.resize( urlLength + 5u ); - char* hashTargetPtr = &( hashTarget[ urlLength ] ); + hashTarget.resize(urlLength + 5u); + char* hashTargetPtr = &(hashTarget[urlLength]); // Pack the width and height (4 bytes total). *hashTargetPtr++ = size.GetWidth() & 0xff; - *hashTargetPtr++ = ( size.GetWidth() >> 8u ) & 0xff; + *hashTargetPtr++ = (size.GetWidth() >> 8u) & 0xff; *hashTargetPtr++ = size.GetHeight() & 0xff; - *hashTargetPtr++ = ( size.GetHeight() >> 8u ) & 0xff; + *hashTargetPtr++ = (size.GetHeight() >> 8u) & 0xff; // Bit-pack the FittingMode, SamplingMode and atlasing. // FittingMode=2bits, SamplingMode=3bits, useAtlas=1bit - *hashTargetPtr = ( fittingMode << 4u ) | ( samplingMode << 1 ) | useAtlas; + *hashTargetPtr = (fittingMode << 4u) | (samplingMode << 1) | useAtlas; } else { // We are not including sizing information, but we still need an extra byte for atlasing. - hashTarget.resize( urlLength + 1u ); + hashTarget.resize(urlLength + 1u); // Add the atlasing to the hash input. - switch( useAtlas ) + switch(useAtlas) { case UseAtlas::NO_ATLAS: { - hashTarget[ urlLength ] = 'f'; + hashTarget[urlLength] = 'f'; break; } case UseAtlas::USE_ATLAS: { - hashTarget[ urlLength ] = 't'; + hashTarget[urlLength] = 't'; break; } } } - if( maskTextureId != INVALID_TEXTURE_ID ) + if(maskTextureId != INVALID_TEXTURE_ID) { auto textureIdIndex = hashTarget.length(); - hashTarget.resize( hashTarget.length() + sizeof( TextureId ) ); - unsigned char* hashTargetPtr = reinterpret_cast(&( hashTarget[ textureIdIndex ] )); + hashTarget.resize(hashTarget.length() + sizeof(TextureId)); + unsigned char* hashTargetPtr = reinterpret_cast(&(hashTarget[textureIdIndex])); // Append the texture id to the end of the URL byte by byte: // (to avoid SIGBUS / alignment issues) - for( size_t byteIter = 0; byteIter < sizeof( TextureId ); ++byteIter ) + for(size_t byteIter = 0; byteIter < sizeof(TextureId); ++byteIter) { *hashTargetPtr++ = maskTextureId & 0xff; maskTextureId >>= 8u; } } - return Dali::CalculateHash( hashTarget ); + return Dali::CalculateHash(hashTarget); } int TextureManager::FindCachedTexture( @@ -1100,32 +1406,31 @@ int TextureManager::FindCachedTexture( const Dali::SamplingMode::Type samplingMode, const bool useAtlas, TextureId maskTextureId, - TextureManager::MultiplyOnLoad preMultiplyOnLoad ) + TextureManager::MultiplyOnLoad preMultiplyOnLoad) { // Default to an invalid ID, in case we do not find a match. int cacheIndex = INVALID_CACHE_INDEX; // Iterate through our hashes to find a match. const unsigned int count = mTextureInfoContainer.size(); - for( unsigned int i = 0u; i < count; ++i ) + for(unsigned int i = 0u; i < count; ++i) { - if( mTextureInfoContainer[i].hash == hash ) + if(mTextureInfoContainer[i].hash == hash) { // We have a match, now we check all the original parameters in case of a hash collision. - TextureInfo& textureInfo( mTextureInfoContainer[i] ); - - if( ( url == textureInfo.url.GetUrl() ) && - ( useAtlas == textureInfo.useAtlas ) && - ( maskTextureId == textureInfo.maskTextureId ) && - ( size == textureInfo.desiredSize ) && - ( ( size.GetWidth() == 0 && size.GetHeight() == 0 ) || - ( fittingMode == textureInfo.fittingMode && - samplingMode == textureInfo.samplingMode ) ) ) + TextureInfo& textureInfo(mTextureInfoContainer[i]); + + if((url == textureInfo.url.GetUrl()) && + (useAtlas == textureInfo.useAtlas) && + (maskTextureId == textureInfo.maskTextureId) && + (size == textureInfo.desiredSize) && + ((size.GetWidth() == 0 && size.GetHeight() == 0) || + (fittingMode == textureInfo.fittingMode && + samplingMode == textureInfo.samplingMode))) { // 1. If preMultiplyOnLoad is MULTIPLY_ON_LOAD, then textureInfo.preMultiplyOnLoad should be true. The premultiplication result can be different. // 2. If preMultiplyOnLoad is LOAD_WITHOUT_MULTIPLY, then textureInfo.preMultiplied should be false. - if( ( preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD && textureInfo.preMultiplyOnLoad ) - || ( preMultiplyOnLoad == TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY && !textureInfo.preMultiplied ) ) + if((preMultiplyOnLoad == TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD && textureInfo.preMultiplyOnLoad) || (preMultiplyOnLoad == TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY && !textureInfo.preMultiplied)) { // The found Texture is a match. cacheIndex = i; @@ -1138,18 +1443,18 @@ int TextureManager::FindCachedTexture( return cacheIndex; } -void TextureManager::ObserverDestroyed( TextureUploadObserver* observer ) +void TextureManager::ObserverDestroyed(TextureUploadObserver* observer) { const unsigned int count = mTextureInfoContainer.size(); - for( unsigned int i = 0; i < count; ++i ) + for(unsigned int i = 0; i < count; ++i) { - TextureInfo& textureInfo( mTextureInfoContainer[i] ); - for( TextureInfo::ObserverListType::Iterator j = textureInfo.observerList.Begin(); - j != textureInfo.observerList.End(); ) + TextureInfo& textureInfo(mTextureInfoContainer[i]); + for(TextureInfo::ObserverListType::Iterator j = textureInfo.observerList.Begin(); + j != textureInfo.observerList.End();) { - if( *j == observer ) + if(*j == observer) { - j = textureInfo.observerList.Erase( j ); + j = textureInfo.observerList.Erase(j); } else { @@ -1157,37 +1462,61 @@ void TextureManager::ObserverDestroyed( TextureUploadObserver* observer ) } } } -} + // Remove element from the LoadQueue + for(auto&& element : mLoadQueue) + { + if(element.mObserver == observer) + { + element.mObserver = nullptr; + } + } +} TextureManager::AsyncLoadingHelper::AsyncLoadingHelper(TextureManager& textureManager) -: AsyncLoadingHelper(Toolkit::AsyncImageLoader::New(), textureManager, - AsyncLoadingInfoContainerType()) +: AsyncLoadingHelper(Toolkit::AsyncImageLoader::New(), textureManager, AsyncLoadingInfoContainerType()) { } -void TextureManager::AsyncLoadingHelper::Load(TextureId textureId, - const VisualUrl& url, - ImageDimensions desiredSize, - FittingMode::Type fittingMode, - SamplingMode::Type samplingMode, - bool orientationCorrection, - DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad) +void TextureManager::AsyncLoadingHelper::LoadAnimatedImage(TextureId textureId, + Dali::AnimatedImageLoading animatedImageLoading, + uint32_t frameIndex) { mLoadingInfoContainer.push_back(AsyncLoadingInfo(textureId)); - auto id = DevelAsyncImageLoader::Load( mLoader, url.GetUrl(), desiredSize, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad ); + auto id = GetImplementation(mLoader).LoadAnimatedImage(animatedImageLoading, frameIndex); mLoadingInfoContainer.back().loadId = id; } -void TextureManager::AsyncLoadingHelper::ApplyMask( TextureId textureId, - Devel::PixelBuffer pixelBuffer, - Devel::PixelBuffer maskPixelBuffer, - float contentScale, - bool cropToMask, - DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad ) +void TextureManager::AsyncLoadingHelper::Load(TextureId textureId, + const VisualUrl& url, + ImageDimensions desiredSize, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection, + DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad) +{ + mLoadingInfoContainer.push_back(AsyncLoadingInfo(textureId)); + if(DALI_UNLIKELY(url.IsBufferResource())) + { + auto id = GetImplementation(mLoader).LoadEncodedImageBuffer(mTextureManager.GetEncodedImageBuffer(url.GetUrl()), desiredSize, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad); + mLoadingInfoContainer.back().loadId = id; + } + else + { + auto id = GetImplementation(mLoader).Load(url, desiredSize, fittingMode, samplingMode, orientationCorrection, preMultiplyOnLoad); + mLoadingInfoContainer.back().loadId = id; + } +} + +void TextureManager::AsyncLoadingHelper::ApplyMask(TextureId textureId, + Devel::PixelBuffer pixelBuffer, + Devel::PixelBuffer maskPixelBuffer, + float contentScale, + bool cropToMask, + DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad) { mLoadingInfoContainer.push_back(AsyncLoadingInfo(textureId)); - auto id = DevelAsyncImageLoader::ApplyMask( mLoader, pixelBuffer, maskPixelBuffer, contentScale, cropToMask, preMultiplyOnLoad ); + auto id = GetImplementation(mLoader).ApplyMask(pixelBuffer, maskPixelBuffer, contentScale, cropToMask, preMultiplyOnLoad); mLoadingInfoContainer.back().loadId = id; } @@ -1197,26 +1526,26 @@ TextureManager::AsyncLoadingHelper::AsyncLoadingHelper(AsyncLoadingHelper&& rhs) } TextureManager::AsyncLoadingHelper::AsyncLoadingHelper( - Toolkit::AsyncImageLoader loader, - TextureManager& textureManager, - AsyncLoadingInfoContainerType&& loadingInfoContainer) + Toolkit::AsyncImageLoader loader, + TextureManager& textureManager, + AsyncLoadingInfoContainerType&& loadingInfoContainer) : mLoader(loader), mTextureManager(textureManager), mLoadingInfoContainer(std::move(loadingInfoContainer)) { DevelAsyncImageLoader::PixelBufferLoadedSignal(mLoader).Connect( - this, &AsyncLoadingHelper::AsyncLoadComplete); + this, &AsyncLoadingHelper::AsyncLoadComplete); } void TextureManager::AsyncLoadingHelper::AsyncLoadComplete(uint32_t id, - Devel::PixelBuffer pixelBuffer ) + Devel::PixelBuffer pixelBuffer) { - mTextureManager.AsyncLoadComplete( mLoadingInfoContainer, id, pixelBuffer ); + mTextureManager.AsyncLoadComplete(mLoadingInfoContainer, id, pixelBuffer); } -void TextureManager::SetBrokenImageUrl(const std::string& brokenImageUrl) +Geometry TextureManager::GetRenderGeometry(TextureId textureId, uint32_t& frontElements, uint32_t& backElements) { - mBrokenImageUrl = brokenImageUrl; + return RenderingAddOn::Get().IsValid() ? RenderingAddOn::Get().GetGeometry(textureId, frontElements, backElements) : Geometry(); } } // namespace Internal