diff options
| author | 2012-04-04 14:09:49 -0700 | |
|---|---|---|
| committer | 2012-04-04 14:27:00 -0700 | |
| commit | e313f721ad97ad44666dd066a891acb4ddfa8ab3 (patch) | |
| tree | 09e8cd5038752374b94fe1fdfed0ad99256f3dd8 | |
| parent | 038d1663e6eb9b0ed8394220530a9bf86b8d8b73 (diff) | |
Store video width/height when scanning
b/5820120
Change-Id: If2faf554bbf49b341d2634915ba98c1efd70574e
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 2f4ed89e126e..26089ad32791 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -609,6 +609,10 @@ public class MediaScanner mCompilation = parseSubstring(value, 0, 0); } else if (name.equalsIgnoreCase("isdrm")) { mIsDrm = (parseSubstring(value, 0, 0) == 1); + } else if (name.equalsIgnoreCase("width")) { + mWidth = parseSubstring(value, 0, 0); + } else if (name.equalsIgnoreCase("height")) { + mHeight = parseSubstring(value, 0, 0); } else { //Log.v(TAG, "unknown tag: " + name + " (" + mProcessGenres + ")"); } @@ -734,9 +738,11 @@ public class MediaScanner map.put(MediaStore.MediaColumns.MIME_TYPE, mMimeType); map.put(MediaStore.MediaColumns.IS_DRM, mIsDrm); + String resolution = null; if (mWidth > 0 && mHeight > 0) { map.put(MediaStore.MediaColumns.WIDTH, mWidth); map.put(MediaStore.MediaColumns.HEIGHT, mHeight); + resolution = mWidth + "x" + mHeight; } if (!mNoMedia) { @@ -746,7 +752,9 @@ public class MediaScanner map.put(Video.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaStore.UNKNOWN_STRING)); map.put(Video.Media.DURATION, mDuration); - // FIXME - add RESOLUTION + if (resolution != null) { + map.put(Video.Media.RESOLUTION, resolution); + } } else if (MediaFile.isImageFileType(mFileType)) { // FIXME - add DESCRIPTION } else if (MediaFile.isAudioFileType(mFileType)) { |