summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorVikas Arora <vikasa@google.com>2011-06-03 00:13:36 +0530
committerVikas Arora <vikasa@google.com>2011-06-03 00:13:36 +0530
commitd0881d95e2d4eceab37288f88f43f771e08eab65 (patch)
tree11fc93168ba26a74bcfc1e0df4dc48325b3838d1 /media
parente8e833fbe8faaa0d49de517040bf01d18c7b9330 (diff)
downloadframeworks_base-d0881d95e2d4eceab37288f88f43f771e08eab65.zip
frameworks_base-d0881d95e2d4eceab37288f88f43f771e08eab65.tar.gz
frameworks_base-d0881d95e2d4eceab37288f88f43f771e08eab65.tar.bz2
Add WebP Mime-Type support in Android Media File
Change-Id: Ifaa64c8fc55d1f1ad14db3057821696b565e0c26
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaFile.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index a54cf28..7634c6c 100644
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -76,8 +76,9 @@ public class MediaFile {
public static final int FILE_TYPE_PNG = 33;
public static final int FILE_TYPE_BMP = 34;
public static final int FILE_TYPE_WBMP = 35;
+ public static final int FILE_TYPE_WEBP = 36;
private static final int FIRST_IMAGE_FILE_TYPE = FILE_TYPE_JPEG;
- private static final int LAST_IMAGE_FILE_TYPE = FILE_TYPE_WBMP;
+ private static final int LAST_IMAGE_FILE_TYPE = FILE_TYPE_WEBP;
// Playlist file types
public static final int FILE_TYPE_M3U = 41;
@@ -213,6 +214,7 @@ public class MediaFile {
addFileType("PNG", FILE_TYPE_PNG, "image/png", MtpConstants.FORMAT_PNG);
addFileType("BMP", FILE_TYPE_BMP, "image/x-ms-bmp", MtpConstants.FORMAT_BMP);
addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp");
+ addFileType("WEBP", FILE_TYPE_WBMP, "image/webp");
addFileType("M3U", FILE_TYPE_M3U, "audio/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);
addFileType("M3U", FILE_TYPE_M3U, "application/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);