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.cpp;h=b125a9eb8f3ab73e761b4c5e6aab96481b145bec;hp=b113438c04a8d63786775fa5c1b738215b36f81e;hb=46322a558e537267a6d3c48630c45afca91b5e27;hpb=ce2689d2ce1b8a73455b2f0a8d142dee4ca4373f diff --git a/dali-toolkit/internal/visuals/texture-manager.cpp b/dali-toolkit/internal/visuals/texture-manager.cpp index b113438..b125a9e 100644 --- a/dali-toolkit/internal/visuals/texture-manager.cpp +++ b/dali-toolkit/internal/visuals/texture-manager.cpp @@ -20,14 +20,15 @@ // EXTERNAL HEADERS #include -#include #include +#include #include // INTERNAL HEADERS #include -#include +#include #include +#include #include @@ -61,8 +62,8 @@ TextureManager::TextureManager() mAsyncRemoteLoader( Toolkit::AsyncImageLoader::New() ), mCurrentTextureId( 0 ) { - mAsyncLocalLoader.ImageLoadedSignal().Connect( this, &TextureManager::AsyncLocalLoadComplete ); - mAsyncRemoteLoader.ImageLoadedSignal().Connect( this, &TextureManager::AsyncRemoteLoadComplete ); + DevelAsyncImageLoader::PixelBufferLoadedSignal(mAsyncLocalLoader).Connect( this, &TextureManager::AsyncLocalLoadComplete ); + DevelAsyncImageLoader::PixelBufferLoadedSignal(mAsyncRemoteLoader).Connect( this, &TextureManager::AsyncRemoteLoadComplete ); } TextureManager::TextureId TextureManager::RequestLoad( @@ -73,7 +74,7 @@ TextureManager::TextureId TextureManager::RequestLoad( const UseAtlas useAtlas, TextureUploadObserver* observer ) { - return RequestInternalLoad( url, INVALID_TEXTURE_ID, desiredSize, fittingMode, samplingMode, useAtlas, GPU_UPLOAD, observer ); + return RequestLoadInternal( url, INVALID_TEXTURE_ID, desiredSize, fittingMode, samplingMode, useAtlas, UPLOAD_TO_TEXTURE, observer ); } TextureManager::TextureId TextureManager::RequestLoad( @@ -85,17 +86,17 @@ TextureManager::TextureId TextureManager::RequestLoad( const UseAtlas useAtlas, TextureUploadObserver* observer ) { - return RequestInternalLoad( url, maskTextureId, desiredSize, fittingMode, samplingMode, useAtlas, GPU_UPLOAD, observer ); + return RequestLoadInternal( url, maskTextureId, desiredSize, fittingMode, samplingMode, useAtlas, UPLOAD_TO_TEXTURE, observer ); } TextureManager::TextureId TextureManager::RequestMaskLoad( const VisualUrl& maskUrl ) { // Use the normal load procedure to get the alpha mask. - return RequestInternalLoad( maskUrl, INVALID_TEXTURE_ID, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, NO_ATLAS, CPU, NULL ); + return RequestLoadInternal( maskUrl, INVALID_TEXTURE_ID, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, NO_ATLAS, KEEP_PIXEL_BUFFER, NULL ); } -TextureManager::TextureId TextureManager::RequestInternalLoad( +TextureManager::TextureId TextureManager::RequestLoadInternal( const VisualUrl& url, TextureId maskTextureId, const ImageDimensions desiredSize, @@ -168,9 +169,8 @@ TextureManager::TextureId TextureManager::RequestInternalLoad( { // 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.textureSet, textureInfo.useAtlas, - textureInfo.atlasRect ); + observer->UploadComplete( true, textureInfo.textureId, textureInfo.textureSet, + textureInfo.useAtlas, textureInfo.atlasRect ); } break; } @@ -200,7 +200,6 @@ void TextureManager::Remove( const TextureManager::TextureId textureId ) { TextureInfo& textureInfo( mTextureInfoContainer[ textureInfoIndex ] ); - DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "TextureManager::Remove(%d) cacheIdx:%d loadState:%s\n", textureId, textureInfoIndex, textureInfo.loadState == TextureManager::NOT_STARTED ? "NOT_STARTED" : @@ -246,6 +245,15 @@ void TextureManager::Remove( const TextureManager::TextureId textureId ) } } +const VisualUrl& TextureManager::GetVisualUrl( TextureId textureId ) +{ + int cacheIndex = GetCacheIndexFromId( textureId ); + DALI_ASSERT_DEBUG( cacheIndex != INVALID_CACHE_INDEX && "TextureId out of range"); + + TextureInfo& cachedTextureInfo( mTextureInfoContainer[ cacheIndex ] ); + return cachedTextureInfo.url; +} + TextureManager::LoadState TextureManager::GetTextureState( TextureId textureId ) { LoadState loadState = TextureManager::NOT_STARTED; @@ -314,17 +322,17 @@ void TextureManager::ObserveTexture( TextureInfo& textureInfo, } } -void TextureManager::AsyncLocalLoadComplete( uint32_t id, PixelData pixelData ) +void TextureManager::AsyncLocalLoadComplete( uint32_t id, Devel::PixelBuffer pixelBuffer ) { - AsyncLoadComplete( mAsyncLocalLoadingInfoContainer, id, pixelData ); + AsyncLoadComplete( mAsyncLocalLoadingInfoContainer, id, pixelBuffer ); } -void TextureManager::AsyncRemoteLoadComplete( uint32_t id, PixelData pixelData ) +void TextureManager::AsyncRemoteLoadComplete( uint32_t id, Devel::PixelBuffer pixelBuffer ) { - AsyncLoadComplete( mAsyncRemoteLoadingInfoContainer, id, pixelData ); + AsyncLoadComplete( mAsyncRemoteLoadingInfoContainer, id, pixelBuffer ); } -void TextureManager::AsyncLoadComplete( AsyncLoadingInfoContainerType& loadingContainer, uint32_t id, PixelData pixelData ) +void TextureManager::AsyncLoadComplete( AsyncLoadingInfoContainerType& loadingContainer, uint32_t id, Devel::PixelBuffer pixelBuffer ) { DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, "TextureManager::AsyncLoadComplete( id:%d )\n", id ); @@ -343,7 +351,8 @@ void TextureManager::AsyncLoadComplete( AsyncLoadingInfoContainerType& loadingCo if( textureInfo.loadState != CANCELLED ) { - PostLoad( textureInfo, pixelData ); + // textureInfo can be invalidated after this call (as the mTextureInfoContainer may be modified) + PostLoad( textureInfo, pixelBuffer ); } else { @@ -356,15 +365,15 @@ void TextureManager::AsyncLoadComplete( AsyncLoadingInfoContainerType& loadingCo } } -void TextureManager::PostLoad( TextureInfo& textureInfo, PixelData pixelData ) +void TextureManager::PostLoad( TextureInfo& textureInfo, Devel::PixelBuffer& pixelBuffer ) { // Was the load successful? - if( pixelData && ( pixelData.GetWidth() != 0 ) && ( pixelData.GetHeight() != 0 ) ) + if( pixelBuffer && ( pixelBuffer.GetWidth() != 0 ) && ( pixelBuffer.GetHeight() != 0 ) ) { // No atlas support for now textureInfo.useAtlas = NO_ATLAS; - if( textureInfo.storageType == GPU_UPLOAD ) + if( textureInfo.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, @@ -374,25 +383,25 @@ void TextureManager::PostLoad( TextureInfo& textureInfo, PixelData pixelData ) LoadState maskLoadState = GetTextureState( textureInfo.maskTextureId ); if( maskLoadState == LOADING ) { - textureInfo.pixelData = pixelData; // Store the pixel data temporarily + textureInfo.pixelBuffer = pixelBuffer; // Store the pixel buffer temporarily textureInfo.loadState = WAITING_FOR_MASK; } else if( maskLoadState == LOAD_FINISHED ) { - ApplyMask( pixelData, textureInfo.maskTextureId ); - UploadTexture( pixelData, textureInfo ); + ApplyMask( pixelBuffer, textureInfo.maskTextureId ); + UploadTexture( pixelBuffer, textureInfo ); NotifyObservers( textureInfo, true ); } } else { - UploadTexture( pixelData, textureInfo ); + UploadTexture( pixelBuffer, textureInfo ); NotifyObservers( textureInfo, true ); } } - else // currently, CPU textures are local to texture manager + else { - textureInfo.pixelData = pixelData; // Store the pixel data + textureInfo.pixelBuffer = pixelBuffer; // Store the pixel data textureInfo.loadState = LOAD_FINISHED; // Check if there was another texture waiting for this load to complete @@ -422,13 +431,13 @@ void TextureManager::CheckForWaitingTexture( TextureInfo& maskTextureInfo ) mTextureInfoContainer[cacheIndex].loadState == WAITING_FOR_MASK ) { TextureInfo& textureInfo( mTextureInfoContainer[cacheIndex] ); - PixelData pixelData = textureInfo.pixelData; - textureInfo.pixelData.Reset(); + Devel::PixelBuffer pixelBuffer = textureInfo.pixelBuffer; + textureInfo.pixelBuffer.Reset(); if( maskTextureInfo.loadState == LOAD_FINISHED ) { - ApplyMask( pixelData, maskTextureInfo.textureId ); - UploadTexture( pixelData, textureInfo ); + ApplyMask( pixelBuffer, maskTextureInfo.textureId ); + UploadTexture( pixelBuffer, textureInfo ); NotifyObservers( textureInfo, true ); } else @@ -441,20 +450,21 @@ void TextureManager::CheckForWaitingTexture( TextureInfo& maskTextureInfo ) } } -void TextureManager::ApplyMask( PixelData pixelData, TextureId maskTextureId ) +void TextureManager::ApplyMask( Devel::PixelBuffer& pixelBuffer, TextureId maskTextureId ) { int maskCacheIndex = GetCacheIndexFromId( maskTextureId ); - PixelData maskPixelData = mTextureInfoContainer[maskCacheIndex].pixelData; - Dali::ApplyMask( pixelData, maskPixelData ); + Devel::PixelBuffer maskPixelBuffer = mTextureInfoContainer[maskCacheIndex].pixelBuffer; + pixelBuffer.ApplyMask( maskPixelBuffer ); } -void TextureManager::UploadTexture( PixelData pixelData, TextureInfo& textureInfo ) +void TextureManager::UploadTexture( Devel::PixelBuffer& pixelBuffer, TextureInfo& textureInfo ) { if( textureInfo.useAtlas != USE_ATLAS ) { DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Concise, " TextureManager::UploadTexture() New Texture for textureId:%d\n", textureInfo.textureId ); - Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() ); + Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, pixelBuffer.GetPixelFormat(), pixelBuffer.GetWidth(), pixelBuffer.GetHeight() ); + PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer ); texture.Upload( pixelData ); textureInfo.textureSet = TextureSet::New(); textureInfo.textureSet.SetTexture( 0u, texture ); @@ -469,22 +479,58 @@ void TextureManager::UploadTexture( PixelData pixelData, TextureInfo& textureInf void TextureManager::NotifyObservers( TextureInfo& textureInfo, bool success ) { - // If there is an observer: Notify the upload is complete - const unsigned int observerCount = textureInfo.observerList.Count(); - for( unsigned int i = 0; i < observerCount; ++i ) + TextureId textureId = textureInfo.textureId; + + // If there is an observer: Notify the load is complete, whether successful or not, + // and erase it from the list + unsigned int observerCount = textureInfo.observerList.Count(); + TextureInfo* info = &textureInfo; + + while( observerCount ) { - TextureUploadObserver* observer = textureInfo.observerList[i]; - if( observer ) + TextureUploadObserver* observer = info->observerList[0]; + + // During UploadComplete() a Control ResourceReady() signal is emitted. + // During that signal the app may add remove /add Textures (e.g. via + // ImageViews). At this point no more observers can be added to the + // observerList, because textureInfo.loadState = UPLOADED. However it is + // possible for observers to be removed, hence we check the observer list + // count every iteration. + + // The reference to the textureInfo struct can also become invalidated, + // because new load requests can modify the mTextureInfoContainer list + // (e.g. if more requests are pushed back it can cause the list to be + // resized invalidating the reference to the TextureInfo ). + observer->UploadComplete( success, info->textureId, info->textureSet, info->useAtlas, info->atlasRect ); + 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) { - observer->UploadComplete( success, textureInfo.textureSet, textureInfo.useAtlas, textureInfo.atlasRect ); - observer->DestructionSignal().Disconnect( this, &TextureManager::ObserverDestroyed ); + return; // texture has been removed - can stop. } - } - textureInfo.observerList.Clear(); + info = &mTextureInfoContainer[ textureInfoIndex ]; + observerCount = info->observerList.Count(); + if ( observerCount > 0 ) + { + // 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 ) + { + if( *j == observer ) + { + info->observerList.Erase( j ); + observerCount--; + break; + } + } + } + } } - TextureManager::TextureId TextureManager::GenerateUniqueTextureId() { return mCurrentTextureId++; @@ -606,12 +652,15 @@ void TextureManager::ObserverDestroyed( TextureUploadObserver* observer ) for( unsigned int i = 0; i < count; ++i ) { TextureInfo& textureInfo( mTextureInfoContainer[i] ); - for( TextureInfo::ObserverListType::Iterator j = textureInfo.observerList.Begin(); j != textureInfo.observerList.End(); ++j ) + for( TextureInfo::ObserverListType::Iterator j = textureInfo.observerList.Begin(); j != textureInfo.observerList.End(); ) { if( *j == observer ) { - textureInfo.observerList.Erase( j ); - break; + j = textureInfo.observerList.Erase( j ); + } + else + { + ++j; } } }