FCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp

equal deleted inserted replaced

-:235a7fc86938
+:2edacbf5d3f9
 #include <e32base.h>
 #include <fbs.h>
 #include <thumbnailmanager.h>
 #include "thumbnailgeneratetask.h"
 #include "thumbnailscaletask.h"
 #include "thumbnailprovider.h"
 #include "thumbnailserver.h"
 #include "thumbnailtaskprocessor.h"
 CThumbnailGenerateTask::CThumbnailGenerateTask( CThumbnailTaskProcessor&
 aProcessor, CThumbnailServer& aServer, RFile64* aFile, TDesC8* aBuffer,
 const TDataType* aMimeType, CThumbnailManager::TThumbnailFlags aFlags,
 const TSize& aSize, TDisplayMode aDisplayMode, TInt aPriority,
 RArray < TThumbnailPersistentSize >* aMissingSizes, const TDesC& aTargetUri,
-TThumbnailSize aThumbnailSize, const TThumbnailId aThumbnailId,
+TThumbnailSize aThumbnailSize, const TInt64 aModified,
 const CThumbnailManager::TThumbnailQualityPreference aQualityPreference ):
 CThumbnailTask( aProcessor, aPriority ), iServer( aServer ),
 iFlags( aFlags ), iSize( aSize ), iDisplayMode( aDisplayMode ),
 iMissingSizes( aMissingSizes ), iTargetUri( aTargetUri ),
-iThumbnailSize( aThumbnailSize ), iThumbnailId(aThumbnailId),
+iThumbnailSize( aThumbnailSize ), iModified(aModified),
 iQualityPreference( aQualityPreference )
 {
 TN_DEBUG2( "CThumbnailGenerateTask(0x%08x)::CThumbnailGenerateTask()", this);
 if ( !aBuffer && aFile)
 if(effectiveTargetSize == TSize())
 {
 iProvider->SetTargetSize( croppedTargetSize );
 }
+TInt providerErr;
 if ( !iBuffer )
 {
-iProvider->GetThumbnailL( iServer.Fs(), iFile, iMimeType, iFlags,
+TRAP(providerErr, iProvider->GetThumbnailL( iServer.Fs(), iFile, iMimeType, iFlags,
-iDisplayMode, iQualityPreference );
+iDisplayMode, iQualityPreference ) );
 }
 else
 {
-iProvider->GetThumbnailL( iServer.Fs(), iBuffer, iMimeType, iFlags,
+TRAP( providerErr, iProvider->GetThumbnailL( iServer.Fs(), iBuffer, iMimeType, iFlags,
-iDisplayMode, iQualityPreference );
+iDisplayMode, iQualityPreference ));
 }
+DoBlacklisting( providerErr, TSize(0,0) );
+User::LeaveIfError( providerErr );
 }
 // ---------------------------------------------------------------------------
 // CThumbnailGenerateTask::RunL()
 if ( aError )
 {
 delete aBitmap;
 aBitmap = NULL;
-// Create a temporary bitmap of size 1 for storing blacklisted thumbnail
-// Because no actual bitmap data is generated, there is no reason to
+DoBlacklisting( aError, aOriginalSize );
-// add bitmap to server bitmap pool. Completion of client request with
-// error code just results in applications showing their default bitmap.
-if( iFilename != KNullDesC || iTargetUri != KNullDesC )
-{
-if ( aError == KErrNotSupported ||
-aError == KErrCorrupt ||
-aError == KErrCompletion)
-{
-TRAPD( err, CreateBlackListedL( aOriginalSize ) );
-if (err != KErrNone)
-{
-TN_DEBUG2( "CThumbnailGenerateTask::ThumbnailProviderReady() - blacklisting failed with code %d", err );
-}
-}
-}
 Complete( aError );
 }
 else
 {
 // CreateScaleTasksL will take ownership of bitmap
 void CThumbnailGenerateTask::CreateScaleTasksL( CFbsBitmap* aBitmap )
 {
 __ASSERT_DEBUG(( aBitmap ), ThumbnailPanic( EThumbnailNullPointer ));
 CleanupStack::PushL( aBitmap );
-iServer.AddBitmapToPoolL( iRequestId.iSession, aBitmap );
+iServer.AddBitmapToPoolL( iRequestId.iSession, aBitmap, iRequestId );
 // Keep pointer so we can delete bitmap from pool
 iBitmap = aBitmap;
 CleanupStack::Pop( aBitmap );
 }
 }
 CThumbnailScaleTask* scaleTask = CThumbnailScaleTask::NewL( iProcessor, iServer, iFilename,
 iBitmap, iOriginalSize, (*iMissingSizes)[ i ].iSize, (*iMissingSizes)[ i ].iCrop, iDisplayMode,
-KMaxPriority, iTargetUri, (*iMissingSizes)[ i ].iType, iThumbnailId, iScaledBitmapToPool, iEXIF );
+KMaxPriority, iTargetUri, (*iMissingSizes)[ i ].iType, iModified, iScaledBitmapToPool, iEXIF );
 CleanupStack::PushL( scaleTask );
 TInt err1 = KErrNone;
 TInt err2 = KErrNone;
 if(iFilename != KNullDesC)
 }
 complTask = CThumbnailScaleTask::NewL( iProcessor, iServer, iFilename,
 iBitmap, iOriginalSize, iSize, iFlags& CThumbnailManager
 ::ECropToAspectRatio, iDisplayMode, KMaxPriority, iTargetUri,
-iThumbnailSize, iThumbnailId, iScaledBitmapToPool, iEXIF );
+iThumbnailSize, iModified, iScaledBitmapToPool, iEXIF );
 CleanupStack::PushL( complTask );
 TInt err1 = KErrNone;
 TInt err2 = KErrNone;
 if(iFilename != KNullDesC)
 // Stores a blacklisted thumbnail
 // ---------------------------------------------------------------------------
 //
 void CThumbnailGenerateTask::CreateBlackListedL( const TSize& aOriginalSize )
 {
+TN_DEBUG1( "CThumbnailGenerateTask::CreateBlackListedL()");
 CFbsBitmap* tempBitmap = 0;
 tempBitmap = new (ELeave) CFbsBitmap();
 CleanupStack::PushL( tempBitmap );
 TSize tempSize( 1, 1 );
 User::LeaveIfError( tempBitmap->Create( tempSize, iDisplayMode ) );
 // Instead of creating a blacklisted entry of requested size (iThumbnailSize) in thumbnail db,
 // consider blacklisting all sizes (hence the changes are needed in thumbnail fetching logic too).
 // However, decoding of source to thumnail could succeed in other sizes, which makes blacklisting
 // of requested size only meaningful.
 if(iFilename != KNullDesC)
 {
 iServer.StoreForPathL( iFilename )->StoreThumbnailL(
-iFilename, tempBitmap, aOriginalSize, EFalse, iThumbnailSize, iThumbnailId, EFalse, ETrue );
+iFilename, tempBitmap, aOriginalSize, EFalse, iThumbnailSize, iModified, EFalse, ETrue );
 }
 else if(iTargetUri != KNullDesC)
 {
 iServer.StoreForPathL( iTargetUri )->StoreThumbnailL(
-iTargetUri, tempBitmap, aOriginalSize, EFalse, iThumbnailSize, iThumbnailId, EFalse, ETrue );
+iTargetUri, tempBitmap, aOriginalSize, EFalse, iThumbnailSize, iModified, EFalse, ETrue );
 }
 CleanupStack::PopAndDestroy( tempBitmap );
 }
+// ---------------------------------------------------------------------------
+// Checks is blacklisting needed
+// ---------------------------------------------------------------------------
+//
+void CThumbnailGenerateTask::DoBlacklisting( const TInt aError, const TSize& aOriginalSize )
+{
+TN_DEBUG1( "CThumbnailGenerateTask::DoBlacklisting()");
+// Create a temporary bitmap of size 1 for storing blacklisted thumbnail
+// Because no actual bitmap data is generated, there is no reason to
+// add bitmap to server bitmap pool. Completion of client request with
+// error code just results in applications showing their default bitmap.
+if( aError != KErrNone && (iFilename != KNullDesC || iTargetUri != KNullDesC ))
+{
+if (aError == KErrNotFound ||
+aError == KErrNotSupported ||
+aError == KErrCorrupt ||
+aError == KErrCompletion ||
+aError == KErrUnderflow ||
+aError == KErrNotReady)
+{
+if(iMissingSizes)
+{
+TN_DEBUG2( "CThumbnailGenerateTask::DoBlacklisting() - blacklist missing sizes count = %d", iMissingSizes->Count() );
+for ( TInt i( 0 ); i < iMissingSizes->Count(); i++ )
+{
+iThumbnailSize = (*iMissingSizes)[ i ].iType;
+TRAPD( err, CreateBlackListedL( aOriginalSize ) );
+if (err != KErrNone)
+{
+TN_DEBUG3( "CThumbnailGenerateTask::DoBlacklisting() - blacklisting missing size %d failed with code %d", iThumbnailSize, err );
+}
+}
+return;
+}
+else
+{
+TN_DEBUG1( "CThumbnailGenerateTask::DoBlacklisting() - blacklist single size" );
+TRAPD( err, CreateBlackListedL( aOriginalSize ) );
+if (err != KErrNone)
+{
+TN_DEBUG2( "CThumbnailGenerateTask::DoBlacklisting() - blacklisting failed with code %d", err );
+}
+return;
+}
+}
+TN_DEBUG1( "CThumbnailGenerateTask::DoBlacklisting() - not blacklisted " );
+}
+}

changeset 14	2edacbf5d3f9
parent 1	235a7fc86938
child 15	7197e789b953