diff -r 2b4b06654caa -r 6257223ede8a imagehandlingutilities/thumbnailmanager/plugins/video/src/thumbnailvideoprovider.cpp --- a/imagehandlingutilities/thumbnailmanager/plugins/video/src/thumbnailvideoprovider.cpp Thu Aug 19 10:13:51 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/plugins/video/src/thumbnailvideoprovider.cpp Tue Aug 31 15:30:59 2010 +0300 @@ -25,6 +25,11 @@ #include "thumbnailmanageruids.hrh" #include "thumbnailmanagerconstants.h" #include "thumbnaillog.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "thumbnailvideoproviderTraces.h" +#endif + #ifndef IMPLEMENTATION_PROXY_ENTRY typedef TAny* TProxyNewLPtr; @@ -59,6 +64,7 @@ iTimeout = EFalse; TN_DEBUG1( "CThumbnailVideoProvider::CThumbnailVideoProvider()" ); + OstTrace0( TRACE_NORMAL, CTHUMBNAILVIDEOPROVIDER_CTHUMBNAILVIDEOPROVIDER, "CThumbnailVideoProvider::CThumbnailVideoProvider" ); } @@ -82,6 +88,7 @@ iTimer.Close(); TN_DEBUG1( "CThumbnailVideoProvider::~CThumbnailVideoProvider()" ); + OstTrace0( TRACE_NORMAL, DUP1_CTHUMBNAILVIDEOPROVIDER_CTHUMBNAILVIDEOPROVIDER, "CThumbnailVideoProvider::~CThumbnailVideoProvider" ); REComSession::DestroyedImplementation( iDtor_ID_Key ); } // ----------------------------------------------------------------------------- @@ -117,6 +124,7 @@ iTimeout = EFalse; TN_DEBUG1( "CThumbnailVideoProvider::RunL() - timeout" ); + OstTrace0( TRACE_NORMAL, CTHUMBNAILVIDEOPROVIDER_RUNL, "CThumbnailVideoProvider::RunL - timeout" ); } } @@ -130,11 +138,18 @@ const TDisplayMode /*aDisplayMode*/, const CThumbnailManager::TThumbnailQualityPreference /*aQualityPreference */) { TN_DEBUG1( "CThumbnailVideoProvider::GetThumbnailL() start" ); + OstTrace0( TRACE_NORMAL, CTHUMBNAILVIDEOPROVIDER_GETTHUMBNAILL, "CThumbnailVideoProvider::GetThumbnailL - start" ); iFlags = aFlags; //set default mode displaymode from global constants iDisplayMode = KStoreDisplayMode; +//Symbian^4 specific +//TODO currently only ARM platforms supports MAP mode +#if !(defined(__CC_ARM) || defined(__ARMCC__)) + iDisplayMode = EColor16M; +#endif + TFileName filename; User::LeaveIfError( aFile.FullName( filename )); @@ -146,6 +161,7 @@ } TN_DEBUG1( "CThumbnailVideoProvider::GetThumbnailL() end" ); + OstTrace0( TRACE_NORMAL, DUP1_CTHUMBNAILVIDEOPROVIDER_GETTHUMBNAILL, "CThumbnailVideoProvider::GetThumbnailL - end" ); } // --------------------------------------------------------------------------- @@ -160,6 +176,7 @@ const CThumbnailManager::TThumbnailQualityPreference /*aQualityPreference */) { TN_DEBUG1( "CThumbnailVideoProvider::GetThumbnailL() - nothing to do" ); + OstTrace0( TRACE_NORMAL, DUP2_CTHUMBNAILVIDEOPROVIDER_GETTHUMBNAILL, "CThumbnailVideoProvider::GetThumbnailL - nothing to do" ); } // --------------------------------------------------------------------------- @@ -169,6 +186,7 @@ void CThumbnailVideoProvider::GetThumbnailL( RFs& /*aFs*/, TDesC8& /*aBuffer*/) { TN_DEBUG1( "CThumbnailVideoProvider::GetThumbnailL() - nothing to do" ); + OstTrace0( TRACE_NORMAL, DUP3_CTHUMBNAILVIDEOPROVIDER_GETTHUMBNAILL, "CThumbnailVideoProvider::GetThumbnailL - nothing to do" ); User::Leave( KErrNotSupported ); } @@ -198,6 +216,7 @@ /*aInfo*/, TInt aError, CFbsBitmap* aThumb ) { TN_DEBUG2( "CThumbnailVideoProvider::NotifyVideoClipThumbCompleted(aError=%d)", aError ); + OstTrace1( TRACE_NORMAL, CTHUMBNAILVIDEOPROVIDER_NOTIFYVIDEOCLIPTHUMBCOMPLETED, "CThumbnailVideoProvider::NotifyVideoClipThumbCompleted;aError=%d", aError ); iTimer.Cancel(); iTimeout = EFalse; @@ -220,6 +239,7 @@ aInfo, TInt aError ) { TN_DEBUG2( "CThumbnailVideoProvider::NotifyVideoClipInfoReady(aError=%d)", aError ); + OstTrace1( TRACE_NORMAL, CTHUMBNAILVIDEOPROVIDER_NOTIFYVIDEOCLIPINFOREADY, "CThumbnailVideoProvider::NotifyVideoClipInfoReady;aError=%d", aError ); if ( aError == KErrNone ) { @@ -231,6 +251,7 @@ if ( err != KErrNone ) { TN_DEBUG2( "CThumbnailVideoProvider::NotifyVideoClipInfoReady() -- GetThumbL() left with %d", err ); + OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILVIDEOPROVIDER_NOTIFYVIDEOCLIPINFOREADY, "CThumbnailVideoProvider::NotifyVideoClipInfoReady - GetThumbL() left with;err=%d", err ); iObserver->ThumbnailProviderReady( err, NULL, TSize(), EFalse, EFalse);