Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 16b72bbb: Merge change 24391 into eclair

Browse Source 
Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp

* commit '16b72bbbc985cba7c59f52bf6969b4015f185830':
  RIO-7461: Update media scanner to scan AAC files.
This commit is contained in:
James Stokebrand
2009-09-09 14:50:19 -07:00
committed by Android Git Automerger
parent be52ad33c7 16b72bbbc9
commit 7ff0d9a60a
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
media/java/android/media/MediaScanner.java
View File

@@ -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