# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701540 -10800 # Node ID 977400b0f7739873d447f929376bf5ef5acdec56 # Parent 473df7bf149f7ce934a2a4e473298ad9971a2fef Revision: 201035 Kit: 201037 diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/ThumbnailManager_0x102830AB_v10.10.8_SA_S60.50_Euro1.sis Binary file imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/ThumbnailManager_0x102830AB_v10.10.8_SA_S60.50_Euro1.sis has changed diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/package.pkg --- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/package.pkg Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/package.pkg Fri Sep 17 08:32:20 2010 +0300 @@ -17,7 +17,7 @@ &EN ; Header -#{"Thumbnail Manager"},(0x102830AB), 10, 10, 8, TYPE=SA, RU +#{"Thumbnail Manager"},(0x102830AB), 10, 10, 9, TYPE=SA, RU ; Localised Vendor name %{"Nokia"} diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/stub.pkg --- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/stub.pkg Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/stub.pkg Fri Sep 17 08:32:20 2010 +0300 @@ -17,7 +17,7 @@ &EN ; Header -#{"ThumbnailManager"},(0x102830AB), 10, 10, 8, TYPE=SA +#{"ThumbnailManager"},(0x102830AB), 10, 10, 9, TYPE=SA ; Localised Vendor name %{"Nokia"} diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/thumbnailmanager_stub.sis Binary file imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/thumbnailmanager_stub.sis has changed diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/sis/thumbnailmanagercenrep/package.pkg --- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanagercenrep/package.pkg Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanagercenrep/package.pkg Fri Sep 17 08:32:20 2010 +0300 @@ -17,7 +17,7 @@ &EN ; Header -#{"Thumbnail Manager Cenrep"},(0x10202BE9), 10, 10, 8, TYPE=SP +#{"Thumbnail Manager Cenrep"},(0x10202BE9), 10, 10, 9, TYPE=SP ; Localised Vendor name %{"Symbian Software Ltd."} diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagaudioobserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagaudioobserver.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagaudioobserver.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -337,12 +337,10 @@ // set observing conditions CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( audioDef ); - CleanupStack::PushL( &addObjectCondition ); + addCondition->AddObjectConditionL( audioDef ); CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( audioDef ); - CleanupStack::PushL( &modifyObjectCondition ); + modifyCondition->AddObjectConditionL( audioDef ); // add observer iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd ); @@ -350,7 +348,7 @@ // modify observer iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify ); - CleanupStack::Pop( 4, addCondition ); + CleanupStack::Pop( 2, addCondition ); TN_DEBUG1( "CThumbAGAudioObserver::AddObserversL() - end" ); OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGAUDIOOBSERVER_ADDOBSERVERSL, "CThumbAGAudioObserver::AddObserversL - end" ); diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagcameraobserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagcameraobserver.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagcameraobserver.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -333,12 +333,10 @@ // set observing conditions CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &addPropertyCondition ); + addCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera)); CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &modifyPropertyCondition ); + modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera)); // add observer iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd ); @@ -346,7 +344,7 @@ // modify observer iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify ); - CleanupStack::Pop( 4, addCondition ); + CleanupStack::Pop( 2, addCondition ); TN_DEBUG1( "CThumbAGCameraObserver::AddObserversL() - end" ); OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGCAMERAOBSERVER_ADDOBSERVERSL, "CThumbAGCameraObserver::AddObserversL - end" ); diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -317,19 +317,14 @@ // set observing conditions CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - - CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( imageDef ); - CleanupStack::PushL( &addObjectCondition ); + addCondition->AddObjectConditionL( imageDef ); - CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &addPropertyCondition ); + addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( imageDef ); - CleanupStack::PushL( &modifyObjectCondition ); + modifyCondition->AddObjectConditionL( imageDef ); - CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &modifyPropertyCondition ); + modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); // add observers iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd ); @@ -337,7 +332,7 @@ // modify observer iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify ); - CleanupStack::Pop( 6, addCondition ); + CleanupStack::Pop( 2, addCondition ); TN_DEBUG1( "CThumbAGImageObserver::AddObserversL() - end" ); OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_ADDOBSERVERSL, "CThumbAGImageObserver::AddObserversL - end" ); diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -1210,7 +1210,7 @@ TN_DEBUG2( "CThumbAGProcessor::RunL() iHarvesterClient observer err = %d", err); OstTrace1( TRACE_NORMAL, DUP9_CTHUMBAGPROCESSOR_RUNL, "CThumbAGProcessor::RunL - iHarvesterClient observer;err=%d", err ); - if( !err ) + if( err != KErrNone ) { TN_DEBUG1( "CThumbAGProcessor::RunL() add iHarvesterClient observer failed"); OstTrace0( TRACE_NORMAL, DUP10_CTHUMBAGPROCESSOR_RUNL, "CThumbAGProcessor::RunL - add iHarvesterClient observer failed" ); @@ -2043,18 +2043,11 @@ CMdELogicCondition& rootCondition = iQueryAllItems->Conditions(); rootCondition.SetOperator( ELogicConditionOperatorOr ); - CMdEObjectCondition& imageObjectCondition = rootCondition.AddObjectConditionL(imageObjDef); - CleanupStack::PushL( &imageObjectCondition ); - - CMdEObjectCondition& videoObjectCondition = rootCondition.AddObjectConditionL(videoObjDef); - CleanupStack::PushL( &videoObjectCondition ); - - CMdEObjectCondition& audioObjectCondition = rootCondition.AddObjectConditionL(audioObjDef); - CleanupStack::PushL( &audioObjectCondition ); + rootCondition.AddObjectConditionL(imageObjDef); + rootCondition.AddObjectConditionL(videoObjDef); + rootCondition.AddObjectConditionL(audioObjDef); iQueryAllItems->FindL(KMdEQueryDefaultMaxCount, KMaxQueryBatchSize); - - CleanupStack::Pop(3, &imageObjectCondition); TN_DEBUG1( "CThumbAGProcessor::QueryAllItemsL - end" ); OstTrace0( TRACE_NORMAL, DUP3_CTHUMBAGPROCESSOR_QUERYALLITEMSL, "CThumbAGProcessor::QueryAllItemsL" ); diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -331,19 +331,14 @@ // set observing conditions CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); + addCondition->AddObjectConditionL( videoDef ); - CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( videoDef ); - CleanupStack::PushL( &addObjectCondition ); - - CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &addPropertyCondition ); + addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd ); - CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( videoDef ); - CleanupStack::PushL( &modifyObjectCondition ); - - CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); - CleanupStack::PushL( &modifyPropertyCondition ); + modifyCondition->AddObjectConditionL( videoDef ); + + modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera)); // add observer iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd ); @@ -351,7 +346,7 @@ // modify observer iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify ); - CleanupStack::Pop( 6, addCondition ); + CleanupStack::Pop( 2, addCondition ); TN_DEBUG1( "CThumbAGVideoObserver::AddObserversL() - end" ); OstTrace0( TRACE_NORMAL, DUP1_CTHUMBAGVIDEOOBSERVER_ADDOBSERVERSL, "CThumbAGVideoObserver::AddObserversL - end" ); diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -369,7 +369,8 @@ { const TInt count = iMissingSizes->Count(); - for ( TInt i( 0 ); i < count; i++ ) + // scale small thumbs first, because fullscreen encoding takes longer + for ( TInt i( count-1 ); i >= 0; i-- ) { TThumbnailSize size = (*iMissingSizes)[ i ].iType; #ifdef _DEBUG @@ -383,7 +384,8 @@ if ( size == EFullScreenThumbnailSize || size == EVideoFullScreenThumbnailSize || size == EAudioFullScreenThumbnailSize || - size == EImageFullScreenThumbnailSize ) + size == EImageFullScreenThumbnailSize || + size == EContactFullScreenThumbnailSize ) { TInt mis_width = (*iMissingSizes)[ i ].iSize.iWidth; TN_DEBUG2( "*iMissingSizes)[ i ].iWidth == %d", (*iMissingSizes)[ i ].iSize.iWidth ); @@ -445,7 +447,8 @@ if ( iThumbnailSize == EFullScreenThumbnailSize || iThumbnailSize == EVideoFullScreenThumbnailSize || iThumbnailSize == EAudioFullScreenThumbnailSize || - iThumbnailSize == EImageFullScreenThumbnailSize ) + iThumbnailSize == EImageFullScreenThumbnailSize || + iThumbnailSize == EContactFullScreenThumbnailSize) { TInt width = iSize.iWidth; iSize.iWidth = iSize.iHeight; diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailscaletask.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailscaletask.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailscaletask.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -260,7 +260,8 @@ if ( (iThumbnailSize == EFullScreenThumbnailSize || iThumbnailSize == EImageFullScreenThumbnailSize || iThumbnailSize == EVideoFullScreenThumbnailSize || - iThumbnailSize == EAudioFullScreenThumbnailSize) && + iThumbnailSize == EAudioFullScreenThumbnailSize || + iThumbnailSize == EContactFullScreenThumbnailSize) && iOriginalSize.iHeight < iTargetSize.iHeight && iOriginalSize.iWidth < iTargetSize.iWidth ) { diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -852,7 +852,8 @@ TSize bitmapSize = bitmap->SizeInPixels(); - for ( TInt i( 0 ); i < count; i++ ) + // scale small thumbs first, because fullscreen encoding takes longer + for ( TInt i( count-1 ); i >= 0; i-- ) { if( bitmapSize.iWidth < bitmapSize.iHeight ) { @@ -861,7 +862,8 @@ if ( size == EFullScreenThumbnailSize || size == EVideoFullScreenThumbnailSize || size == EAudioFullScreenThumbnailSize || - size == EImageFullScreenThumbnailSize ) + size == EImageFullScreenThumbnailSize || + size == EContactFullScreenThumbnailSize ) { TInt height = (*missingSizes)[i].iSize.iHeight; (*missingSizes)[i].iSize.iHeight = (*missingSizes)[i].iSize.iWidth; diff -r 473df7bf149f -r 977400b0f773 imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp --- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp Thu Sep 02 20:45:11 2010 +0300 +++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp Fri Sep 17 08:32:20 2010 +0300 @@ -1370,8 +1370,10 @@ flags |= KThumbnailDbFlagBlacklisted; } - if( (aThumbnailSize == EImageFullScreenThumbnailSize || aThumbnailSize == EVideoFullScreenThumbnailSize || - aThumbnailSize == EAudioFullScreenThumbnailSize) && !aBlackListed ) + if( (aThumbnailSize == EImageFullScreenThumbnailSize || + aThumbnailSize == EVideoFullScreenThumbnailSize || + aThumbnailSize == EAudioFullScreenThumbnailSize || + aThumbnailSize == EContactFullScreenThumbnailSize) && !aBlackListed ) { TN_DEBUG1( "CThumbnailStore::StoreThumbnailL( public ) - encode jpg" ); OstTrace0( TRACE_NORMAL, DUP11_CTHUMBNAILSTORE_STORETHUMBNAILL, "CThumbnailStore::StoreThumbnailL - encode jpg" ); diff -r 473df7bf149f -r 977400b0f773 package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Fri Sep 17 08:32:20 2010 +0300 @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 473df7bf149f -r 977400b0f773 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Sep 17 08:32:20 2010 +0300 @@ -0,0 +1,1 @@ +