MCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailclient/src/thumbnailrequestactive.cpp

equal deleted inserted replaced

-:82749d516180
+:2eb74cf6572e
 // CThumbnailRequestActive::RunL()
 // ---------------------------------------------------------------------------
 //
 void CThumbnailRequestActive::RunL()
 {
-TN_DEBUG2( "CThumbnaiRequestActive::RunL() - request ID: %d", iParams.iRequestId );
+TN_DEBUG2( "CThumbnailRequestActive::RunL() - request ID: %d", iParams.iRequestId );
 if ( iParams.iControlFlags == EThumbnailPreviewThumbnail )
 {
 iRequestCompleted = EFalse;
 		iProcessingPreview = ETrue;
 #endif
 }
 else if ( iStatus.Int() == KThumbnailErrThumbnailNotFound && iParams.iFileName.Length() &&
 !( iParams.iFlags& CThumbnailManager::EDoNotCreate ))
 {
-TN_DEBUG1( "CThumbnaiRequestActive::RunL() - no thumbnail found - lets try with file handle" );
+TN_DEBUG2( "CThumbnaiRequestActive::RunL() - no thumbnail found - lets try with file handle %S", &iParams.iFileName );
 iRequestCompleted = EFalse;
 // We tried to get thumbnail using file path, but it was not found in
 // the database. We need to open the file now (on the client side) and
 // use file handle.
-User::LeaveIfError( iFile.Open( iFs, iParams.iFileName, EFileShareReadersOrWriters ));
+TInt err = iFile.Open( iFs, iParams.iFileName, EFileShareReadersOrWriters );
+TN_DEBUG2( "CThumbnaiRequestActive::RunL() - file handle open err = %d", err );
+User::LeaveIfError( err );
 CleanupClosePushL( iFile );
 TN_DEBUG2( "CThumbnaiRequestActive::RunL() - file handle opened for %S", &iParams.iFileName );
 iSession.RequestThumbnailL( iFile, iParams.iFileName, iParamsPckg, iStatus );
 TCallBack(TimerCallBack, this));
 SetActive();
 }
 else if ( iStatus.Int())
 {
-TN_DEBUG2( "CThumbnaiRequestActive::RunL() - error (%d) occured", iStatus.Int() );
+TN_DEBUG2( "CThumbnailRequestActive::RunL() - error (%d) occured", iStatus.Int() );
 // An error occurred
 iError = iStatus.Int();
 HandleError();
 }
-else if (iParams.iControlFlags == EThumbnailGeneratePersistentSizesOnly)
+//1st round thumb ready from exif (stored)
+else if (iParams.iOriginalControlFlags == EThumbnailGeneratePersistentSizesOnly && !iProcessingPreview)
 	    {
-	    TN_DEBUG1( "CThumbnaiRequestActive::RunL()- generate persistent sizes" );
+	    TN_DEBUG1( "CThumbnaiRequestActive::RunL()- generate persistent sizes thumbnailready" );
 	    iBitmapHandle = iParams.iBitmapHandle;
 	    TN_DEBUG2( "CThumbnaiRequestActive::RunL() - iObserver.ThumbnailReady %d", iParams.iRequestId );
 	    iObserver.ThumbnailReady( iStatus.Int(), *iCallbackThumbnail, iParams.iRequestId );
 	    ReleaseServerBitmap();
 	    iRequestQueue->RequestComplete(this);
 #ifdef _DEBUG
 TTime stop;
 stop.UniversalTime();
 TN_DEBUG3( "CThumbnailRequestActive::RunL() total execution time %d, %d ms",
 iParams.iRequestId, (TInt)stop.MicroSecondsFrom(iStartExecTime).Int64()/1000 );
 #endif
 	    }
+//1st round preview ready from too low quality exif/exif not found (not-stored)
+//relauch using normal decoding
+else if (iParams.iOriginalControlFlags == EThumbnailGeneratePersistentSizesOnly && iProcessingPreview)
+{
+TN_DEBUG1( "CThumbnaiRequestActive::RunL()- generate persistent sizes thumbnailpreviewready" );
+iBitmapHandle = iParams.iBitmapHandle;
+TN_DEBUG2( "CThumbnaiRequestActive::RunL() - iObserver.ThumbnailPreviewReady %d", iParams.iRequestId );
+iObserver.ThumbnailPreviewReady( *iCallbackThumbnail, iParams.iRequestId );
+iProcessingPreview = EFalse;
+ReleaseServerBitmap();
+//set flags so that EThumbnailGeneratePersistentSizesOnly is done aka check all missing sizes
+iParams.iQualityPreference = CThumbnailManager::EOptimizeForQuality;
+iParams.iControlFlags = EThumbnailGeneratePersistentSizesOnly;
+iRequestType = EReqUpdateThumbnails;
+//increase priority
+this->SetPriority(this->Priority() + 1);
+iParams.iPriority++;
+iSession.UpdateThumbnails( iPath, iOrientation, iModified, iParamsPckg, iStatus );
+SetActive();
+	#ifdef _DEBUG
+TTime stop;
+stop.UniversalTime();
+TN_DEBUG3( "CThumbnailRequestActive::RunL() total execution time %d, %d ms",
+iParams.iRequestId, (TInt)stop.MicroSecondsFrom(iStartExecTime).Int64()/1000 );
+	#endif
+}
 else
 {
-TN_DEBUG1( "CThumbnaiRequestActive::RunL() - succesful" );
+TN_DEBUG1( "CThumbnailRequestActive::RunL() - succesful" );
 // Success
 iBitmapHandle = iParams.iBitmapHandle;
-CFbsBitmap* bitmap = new( ELeave )CFbsBitmap();
-CleanupStack::PushL( bitmap );
+if( iBitmapHandle )
-User::LeaveIfError( bitmap->Duplicate( iBitmapHandle ));
+{
-CleanupStack::Pop( bitmap );
+CFbsBitmap* bitmap = new( ELeave )CFbsBitmap();
+CleanupStack::PushL( bitmap );
-		// reduce bpp value (displaymode to match reqested bits per pixel)
+User::LeaveIfError( bitmap->Duplicate( iBitmapHandle ));
-		#ifdef _DEBUG
+CleanupStack::Pop( bitmap );
-TN_DEBUG2( "CThumbnaiRequestActive::RunL() - displaymode is %d", bitmap->DisplayMode());
-		#endif
+// reduce bpp value (displaymode to match reqested bits per pixel)
+#ifdef _DEBUG
-if( bitmap->DisplayMode() > iParams.iDisplayMode )
+TN_DEBUG2( "CThumbnailRequestActive::RunL() - displaymode is %d", bitmap->DisplayMode());
-{
+#endif
-bitmap->SetDisplayMode( iParams.iDisplayMode );
-			#ifdef _DEBUG
+if( bitmap->DisplayMode() > iParams.iDisplayMode )
-TN_DEBUG2( "CThumbnaiRequestActive::RunL() - displaymode is now %d", bitmap->DisplayMode());
+{
-			#endif
+bitmap->SetDisplayMode( iParams.iDisplayMode );
+#ifdef _DEBUG
+TN_DEBUG2( "CThumbnailRequestActive::RunL() - displaymode is now %d", bitmap->DisplayMode());
+#endif
+}
+iCallbackThumbnail->Set( bitmap, iClientData );
+bitmap = NULL; // Owned by iCallbackThumbnail or client now
 }
-iCallbackThumbnail->Set( bitmap, iClientData );
-bitmap = NULL; // Owned by iCallbackThumbnail or client now
 if ( iProcessingPreview )
 {
-TN_DEBUG2( "CThumbnaiRequestActive::RunL() - iObserver.ThumbnailPreviewReady %d", iParams.iRequestId );
+TN_DEBUG2( "CThumbnailRequestActive::RunL() - iObserver.ThumbnailPreviewReady %d", iParams.iRequestId );
+			//increase priority of 2nd round (both, AO and request itself)
+this->SetPriority(this->Priority() + 1);
+iParams.iPriority++;
 iObserver.ThumbnailPreviewReady( *iCallbackThumbnail, iParams.iRequestId );
 iProcessingPreview = EFalse;
 ReleaseServerBitmap();
 Get2ndPhaseThumbnailL();
 }
 else
 {
-TN_DEBUG2( "CThumbnaiRequestActive::RunL() - iObserver.ThumbnailReady %d", iParams.iRequestId );
+TN_DEBUG2( "CThumbnailRequestActive::RunL() - iObserver.ThumbnailReady %d", iParams.iRequestId );
 iObserver.ThumbnailReady( iStatus.Int(), * iCallbackThumbnail, iParams.iRequestId );
 ReleaseServerBitmap();
 iRequestQueue->RequestComplete(this);
 iClientData = aClientData;
 iParams.iControlFlags = (aGeneratePersistentSizesOnly ?
 						EThumbnailGeneratePersistentSizesOnly :
 						EThumbnailNoControlFlags);
+iParams.iOriginalControlFlags = iParams.iControlFlags;
 iParams.iBitmapHandle = 0;
 iParams.iSize = aSize;
 iParams.iDisplayMode = aDisplayMode;
 User::LeaveIfError( aFile.FullName( iParams.iFileName ));
 iParams.iRequestId = iRequestId;
 iRequestType = EReqGetThumbnailHandleLater;
 iClientData = aClientData;
 iParams.iControlFlags = (aGeneratePersistentSizesOnly ?
 EThumbnailGeneratePersistentSizesOnly :
 EThumbnailNoControlFlags);
+iParams.iOriginalControlFlags = iParams.iControlFlags;
 iParams.iBitmapHandle = 0;
 iParams.iSize = aSize;
 iParams.iDisplayMode = aDisplayMode;
 iParams.iFileName = aPath;
 iParams.iRequestId = iRequestId;
 iClientData = aClientData;
 iParams.iControlFlags = (aGeneratePersistentSizesOnly ?
 						EThumbnailGeneratePersistentSizesOnly :
 						EThumbnailNoControlFlags);
+iParams.iOriginalControlFlags = iParams.iControlFlags;
 iParams.iBitmapHandle = 0;
 iParams.iSize = aSize;
 iParams.iDisplayMode = aDisplayMode;
 iParams.iRequestId = iRequestId;
 iParams.iPriority = aPriority;
 iClientData = aClientData;
 iParams.iControlFlags = (aGeneratePersistentSizesOnly ?
 EThumbnailGeneratePersistentSizesOnly :
 EThumbnailNoControlFlags);
+iParams.iOriginalControlFlags = iParams.iControlFlags;
 iParams.iMimeType = TDataType( aMimeType );
 iParams.iBitmapHandle = 0;
 iParams.iSize = aSize;
 iParams.iBuffer = aBuffer; // save pointer for deletion (~CThumbnailRequestActive())
 iParams.iThumbnailSize = aThumbnailSize;
 {
 iClientData = aClientData;
 iParams.iControlFlags = (aGeneratePersistentSizesOnly ?
 EThumbnailGeneratePersistentSizesOnly :
 EThumbnailNoControlFlags);
+iParams.iOriginalControlFlags = iParams.iControlFlags;
 iParams.iBitmapHandle = 0;
 iParams.iSize = aSize;
 iParams.iThumbnailSize = aThumbnailSize;
 iParams.iDisplayMode = aDisplayMode;
 iParams.iRequestId = iRequestId;
 const TInt64 aModified )
 {
 iRequestType = EReqUpdateThumbnails;
 iParams.iControlFlags = EThumbnailGeneratePersistentSizesOnly;
+iParams.iOriginalControlFlags = iParams.iControlFlags;
 iParams.iBitmapHandle = 0;
 iParams.iDisplayMode = aDisplayMode;
 iParams.iRequestId = iRequestId;
 iParams.iPriority = aPriority;
 iParams.iFlags = aFlags;
 TN_DEBUG1( "CThumbnailRequestActive::StartError");
 iStartError = aErr;
 iRequestActive = ETrue;
-iTimer->Start( KClientRequestStartErrorTimeout, KClientRequestStartErrorTimeout,
+if (!iTimer->IsActive())
-TCallBack(TimerCallBack, this));
+{
+iTimer->Start( KClientRequestStartErrorTimeout, KClientRequestStartErrorTimeout,
+TCallBack(TimerCallBack, this));
+}
 }
 // ---------------------------------------------------------------------------
 // CThumbnailRequestActive::TimerCallBack()
 // ---------------------------------------------------------------------------

branch	RCL_3
changeset 7	2eb74cf6572e
parent 5	82749d516180
child 9	dea39715fc05