diff options
| author | 2009-09-09 11:06:20 -0500 | |
|---|---|---|
| committer | 2009-09-09 11:22:21 -0700 | |
| commit | a79da2e9b4b57ca72aa9634f80a7a975b9d7a877 (patch) | |
| tree | 48b5ecd37362c3ff03f68ecef78021f8157dd576 | |
| parent | cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd (diff) | |
RIO-7461: Update media scanner to scan AAC files.
(Change in frameworks/base git)
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index fcc76ca5d4ae..f6d30e03d3a0 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -493,6 +493,22 @@ public class MediaScanner doScanFile(path, mimeType, lastModified, fileSize, false); } + private boolean isMetadataSupported(int fileType) { + if (mFileType == MediaFile.FILE_TYPE_MP3 || + mFileType == MediaFile.FILE_TYPE_MP4 || + mFileType == MediaFile.FILE_TYPE_M4A || + mFileType == MediaFile.FILE_TYPE_3GPP || + mFileType == MediaFile.FILE_TYPE_3GPP2 || + mFileType == MediaFile.FILE_TYPE_OGG || + mFileType == MediaFile.FILE_TYPE_AAC || + mFileType == MediaFile.FILE_TYPE_MID || + mFileType == MediaFile.FILE_TYPE_WMA) { + // we only extract metadata from MP3, M4A, OGG, MID, AAC and WMA files. + // check MP4 files, to determine if they contain only audio. + return true; + } + return false; + } public Uri doScanFile(String path, String mimeType, long lastModified, long fileSize, boolean scanAlways) { Uri result = null; // long t1 = System.currentTimeMillis(); @@ -508,16 +524,7 @@ public class MediaScanner boolean music = (lowpath.indexOf(MUSIC_DIR) > 0) || (!ringtones && !notifications && !alarms && !podcasts); - if (mFileType == MediaFile.FILE_TYPE_MP3 || - mFileType == MediaFile.FILE_TYPE_MP4 || - mFileType == MediaFile.FILE_TYPE_M4A || - mFileType == MediaFile.FILE_TYPE_3GPP || - mFileType == MediaFile.FILE_TYPE_3GPP2 || - mFileType == MediaFile.FILE_TYPE_OGG || - mFileType == MediaFile.FILE_TYPE_MID || - mFileType == MediaFile.FILE_TYPE_WMA) { - // we only extract metadata from MP3, M4A, OGG, MID and WMA files. - // check MP4 files, to determine if they contain only audio. + if( isMetadataSupported(mFileType) ) { processFile(path, mimeType, this); } else if (MediaFile.isImageFileType(mFileType)) { // we used to compute the width and height but it's not worth it |