MCL/sf/mw/mmappfw: comparison mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp

equal deleted inserted replaced

-:d240f0a77280
+:780c925249c1
 // local to this file, non standard mimetype used for ASF parsing with helix
 _LIT( KHxMimeTypeWma, "audio/x-hx-wma" );
 _LIT( KHxMimeTypeWmv, "video/x-hx-wmv" );
+const TInt KMaxRenameTimes = 10;
+const TInt KRenameThreshold = 100 * 1000; // (100 millisec)
 // -----------------------------------------------------------------------------
 // MmMtpDpUtility::FormatFromFilename
 // Utility function to get the type of an object from the filename
 // The recommended way from the MS implementation
 // These should be kept in sync with the object formats supported
 {
 return EMTPFormatCodeAssociation;
 }
 TParsePtrC file( aFullFileName );
+if ( !file.ExtPresent() )
+return EMTPFormatCodeUndefined;
 // need to do it in popularity of format, to optmize performance
 if ( file.Ext().CompareF( KTxtExtensionMP3 ) == 0 )
 return EMTPFormatCodeMP3;
 {
 delete mime;
 mime = NULL;
 }
 }
+if ( file.Ext().CompareF( KTxtExtensionALB ) == 0 )
+return EMTPFormatCodeAbstractAudioAlbum;
 if (( file.Ext().CompareF( KTxtExtensionPLA ) == 0 ) || ( file.Ext().CompareF( KTxtExtensionVIR ) == 0 ) )
 return EMTPFormatCodeAbstractAudioVideoPlaylist;
 if ( file.Ext().CompareF( KTxtExtensionM3U ) == 0 )
 else
 return EFalse;
 }
 // -----------------------------------------------------------------------------
-// MmMtpDpUtility::IsVideo (Slow Version)
-// Utility function to determine whether a format is Video or not
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TBool MmMtpDpUtility::IsVideo( const TDesC& aFullFileName )
-{
-PRINT1( _L( "MM MTP => MmMtpDpUtility::IsVideoL (Slow Version) aFullFileName = %S" ), &aFullFileName );
-TParsePtrC pathParser( aFullFileName );
-TPtrC ext( pathParser.Ext() );
-if ( ext.Length() <= 0 )
-{
-PRINT( _L( "MM MTP <> MmMtpDpUtility::IsVideoL ext len <= 0, return false" ) );
-return EFalse;
-}
-// move WMV early to optmize comparison
-if ( ext.CompareF( KTxtExtensionWMV ) == 0 )
-{
-return ETrue;
-}
-else if ( ext.CompareF( KTxtExtensionMP4 ) == 0
-|| ext.CompareF( KTxtExtension3GP ) == 0
-|| ext.CompareF( KTxtExtension3G2 ) == 0
-|| ext.CompareF( KTxtExtensionODF ) == 0
-|| ext.CompareF( KTxtExtensionASF ) == 0 )
-{
-HBufC8* mimetype = ContainerMimeType( aFullFileName );
-if ( mimetype != NULL )
-{
-TMmMtpSubFormatCode subFormatCode;
-TInt err = SubFormatCodeFromMime(*mimetype, subFormatCode);
-PRINT1( _L( "MM MTP <> MmMtpDpUtility::IsVideoL SubFormatCodeFromMime err = %d" ), err );
-if ( subFormatCode == EMTPSubFormatCodeVideo )
-{
-return ETrue;
-}
-}
-}
-else if ( ext.CompareF( KTxtExtensionO4V ) == 0 )
-return ETrue;
-// NOTE: Treate all non-video files as audio files even it's not audio
-// since the entry is not going to be find out in MPX
-// we can handle that situation gracefully.
-return EFalse;
-}
-// -----------------------------------------------------------------------------
-// MmMtpDpUtility::IsVideoL (Fast Version)
-// Utility function to determine whether a format is Video or not
-// -----------------------------------------------------------------------------
-//
-TBool MmMtpDpUtility::IsVideoL( const TDesC& aFullFileName,
-const MMTPDataProviderFramework& aFramework )
-{
-PRINT1( _L( "MM MTP => MmMtpDpUtility::IsVideoL (Fast Version) aFullFileName = %S" ), &aFullFileName );
-CMTPObjectMetaData* info = CMTPObjectMetaData::NewLC(); // + info
-aFramework.ObjectMgr().ObjectL( aFullFileName, *info );
-TUint formatCode = info->Uint( CMTPObjectMetaData::EFormatCode );
-TUint subFormatCode = info->Uint( CMTPObjectMetaData::EFormatSubCode );
-TBool ifNeedParse = ( ( formatCode == EMTPFormatCodeMP4Container )
-|| ( formatCode == EMTPFormatCode3GPContainer )
-|| ( formatCode== EMTPFormatCodeASF ) )
-&& ( subFormatCode == EMTPSubFormatCodeUnknown );
-TBool isVideo = EFalse;
-if ( ifNeedParse )
-{
-isVideo = MmMtpDpUtility::IsVideo( aFullFileName );
-subFormatCode = isVideo ? EMTPSubFormatCodeVideo : EMTPSubFormatCodeAudio;
-// Once we got the subformat code, set it into fw db
-aFramework.ObjectMgr().ModifyObjectL( *info );
-}
-else
-{
-isVideo = MmMtpDpUtility::IsVideoL( formatCode, subFormatCode );
-}
-CleanupStack::PopAndDestroy( info ); // - info
-return isVideo;
-}
-// -----------------------------------------------------------------------------
-// MmMtpDpUtility::IsVideoL (Fast Version)
-// Utility function to determine whether a format is Video or not
-// -----------------------------------------------------------------------------
-//
-TBool MmMtpDpUtility::IsVideoL( TUint aFormatCode, TUint aSubFormatCode )
-{
-if ( aFormatCode == KMTPFormatsAll )
-User::Leave( KErrArgument );
-if ( aFormatCode == EMTPFormatCodeWMV )
-{
-return ETrue;
-}
-else if ( ( aFormatCode == EMTPFormatCodeMP4Container )
-|| ( aFormatCode == EMTPFormatCode3GPContainer )
-|| ( aFormatCode == EMTPFormatCodeASF ) )
-{
-if ( aSubFormatCode == EMTPSubFormatCodeAudio )
-{
-return EFalse;
-}
-else if ( aSubFormatCode == EMTPSubFormatCodeVideo )
-{
-return ETrue;
-}
-}
-PRINT( _L( "MM MTP <= MmMtpDpUtility::IsVideoL (Fast Version)" ) );
-// other format, as audio
-return EFalse;
-}
-// -----------------------------------------------------------------------------
 // MmMtpDpUtility::ValidateFilename
 // Check the filename to see if it exceeds Symbian 256 limit.
 // -----------------------------------------------------------------------------
 //
 TBool MmMtpDpUtility::ValidateFilename( const TDesC& aPathName,
 // -----------------------------------------------------------------------------
 // MmMtpDpUtility::GetDateModifiedL
 // Get the file date modified.
 // -----------------------------------------------------------------------------
 //
-TTime MmMtpDpUtility::GetObjectDateModifiedL( RFs& aFs, const TDesC& aFullFileName )
+void MmMtpDpUtility::GetObjectDateModifiedL( RFs& aFs, const TDesC& aFullFileName, TDes& aDateModified )
 {
-TTime dataModified;
+TTime date;
 TEntry fileInfo;
 // Shouldn't leave
 User::LeaveIfError( aFs.Entry( aFullFileName, fileInfo ) );
+date = fileInfo.iModified;
-dataModified = fileInfo.iModified;
+date.FormatL( aDateModified, KMtpDateTimeFormat );
-return dataModified;
 }
 // -----------------------------------------------------------------------------
 // MmMtpDpUtility::GetProtectionStatusL
 // Get the file protection status.
 // -----------------------------------------------------------------------------
 // MmMtpDpUtility::CheckPropType
 // Check if property type match datatype.
 // -----------------------------------------------------------------------------
 //
-TMTPResponseCode MmMtpDpUtility::CheckPropType(TUint16 aPropertyCode, TUint16 aDataType)
+TMTPResponseCode MmMtpDpUtility::CheckPropType( TUint16 aPropertyCode, TUint16 aDataType )
 {
 PRINT2( _L( "MM MTP => MmMtpDpUtility::CheckPropCode aPropertyCode = 0x%x, aDataType = 0x%x" ),
 aPropertyCode,
 aDataType );
 case EMTPObjectPropCodePersistentUniqueObjectIdentifier:
 case EMTPObjectPropCodeDateCreated:
 case EMTPObjectPropCodeDateModified:
 case EMTPObjectPropCodeDateAdded:
 case EMTPObjectPropCodeVideoBitRate:
+case EMTPObjectPropCodeRepresentativeSampleFormat:
+case EMTPObjectPropCodeRepresentativeSampleSize:
+case EMTPObjectPropCodeRepresentativeSampleHeight:
+case EMTPObjectPropCodeRepresentativeSampleWidth:
 {
 responseCode = EMTPRespCodeAccessDenied;
 }
 break;
 case EMTPObjectPropCodeParentalRating: // 0xDC94
 case EMTPObjectPropCodeComposer: // 0xDC96
 case EMTPObjectPropCodeOriginalReleaseDate: // 0xDC99
 case EMTPObjectPropCodeAlbumName: // 0xDC9A
 case EMTPObjectPropCodeEncodingProfile: // 0xDEA1
+case EMTPObjectPropCodeAlbumArtist: // 0xDC9B
 {
 if ( aDataType != EMTPTypeString )
 {
 responseCode = EMTPRespCodeInvalidObjectPropFormat;
 }
 //Uint32 properties
 case EMTPObjectPropCodeWidth: // 0xDC87
 case EMTPObjectPropCodeHeight: // 0xDC88
 case EMTPObjectPropCodeDuration: // 0xDC89
-case EMTPObjectPropCodeUseCount: // 0xDC91
 case EMTPObjectPropCodeSampleRate: // 0xDE93
 case EMTPObjectPropCodeAudioWAVECodec: // 0xDE99
 case EMTPObjectPropCodeAudioBitRate: // 0xDE9A
 case EMTPObjectPropCodeVideoFourCCCodec: // 0xDE9B
 case EMTPObjectPropCodeFramesPerThousandSeconds: // 0xDE9D
 responseCode = EMTPRespCodeInvalidObjectPropFormat;
 }
 }
 break;
+case EMTPObjectPropCodeRepresentativeSampleData:
+{
+if ( aDataType != EMTPTypeAUINT8 )
+{
+responseCode = EMTPRespCodeInvalidObjectPropFormat;
+}
+}
+break;
 default:
 {
 responseCode = EMTPRespCodeInvalidObjectPropCode;
 }
 break;
 else
 {
 aNewName.Insert( 0, ptr );
 }
-return aFs.Rename( aFullFileName, aNewName );
+TInt ret = KErrNone;
+// Some other component might be holding on to the file (MDS background harvesting),
+// try again after 100 millisec, up to 10 times, before give up
+TInt count = KMaxRenameTimes;
+while ( count > 0 )
+{
+ret = aFs.Rename( aFullFileName, aNewName );
+if ( ( ret == KErrInUse ) && ( count > 1 ) )
+{
+User::After( KRenameThreshold );
+count--;
+}
+else
+{
+break;
+}
+}
+PRINT1( _L( "MM MTP <> MmMtpDpUtility::UpdateObjectFileName, ret = %d" ), ret );
+return ret;
 }
 // -----------------------------------------------------------------------------
 // MetadataAccessWrapper::ContainerMimeType
 // Get mime type from file
 // -----------------------------------------------------------------------------
 // MetadataAccessWrapper::SubFormatCodeFromMime
 // Get subformat code from mime string
 // -----------------------------------------------------------------------------
 //
-TInt MmMtpDpUtility::SubFormatCodeFromMime( const TDesC8& aMimeType,
+TMmMtpSubFormatCode MmMtpDpUtility::SubFormatCodeFromMime( const TDesC8& aMimeType )
-TMmMtpSubFormatCode& aSubFormatCode )
 {
 PRINT( _L( "MM MTP => MmMtpDpUtility::SubFormatCodeFromMime" ) );
+TMmMtpSubFormatCode subFormatCode = EMTPSubFormatCodeUnknown;
 if ( aMimeType.CompareF( KMimeTypeVideoMp4 ) == 0
 || aMimeType.CompareF( KMimeTypeVideo3gpp ) == 0
 #ifdef __WINDOWS_MEDIA
 || aMimeType.CompareF( KMimeTypeVideoWm ) == 0
 #endif
 )
 {
-aSubFormatCode = EMTPSubFormatCodeVideo;
+subFormatCode = EMTPSubFormatCodeVideo;
 }
 else if ( aMimeType.CompareF( KMimeTypeAudioMp4 ) == 0
 || aMimeType.CompareF( KMimeTypeAudio3gpp ) == 0
 #ifdef __WINDOWS_MEDIA
 || aMimeType.CompareF( KMimeTypeAudioWm ) == 0
 #endif
 )
 {
-aSubFormatCode = EMTPSubFormatCodeAudio;
+subFormatCode = EMTPSubFormatCodeAudio;
 }
 else
 {
 PRINT( _L( "MM MTP <= MmMtpDpUtility::SubFormatCodeFromMime format not supported" ) );
-return KErrNotFound;
+subFormatCode = EMTPSubFormatCodeUndefine;
 }
-PRINT( _L( "MM MTP <= MmMtpDpUtility::SubFormatCodeFromMime" ) );
+PRINT1( _L( "MM MTP <= MmMtpDpUtility::SubFormatCodeFromMime SubFormatCode = %d" ), subFormatCode );
-return KErrNone;
+return subFormatCode;
 }
 // -----------------------------------------------------------------------------
 // MetadataAccessWrapper::GetDrmStatus
 // Get drm status code from file

branch	RCL_3
changeset 11	780c925249c1
parent 9	05b0d2323768
child 12	51035f0751c2