Bug 1339204 - Adds support in StageFright for VP9.0 FourCCs r?cpearce draft
authorJay Harris <jharris@mozilla.com>
Tue, 14 Feb 2017 10:29:46 +1300
changeset 483151 a54cb3b39708d9005784a828ef0765318b6da69e
parent 483150 fadb11d81074f347d58001d3a8db4f5a13441848
child 483152 af19493d1f9b13c86eef80e974715d12ded00dd3
push id45236
push userbmo:jharris@mozilla.com
push dateMon, 13 Feb 2017 21:39:14 +0000
reviewerscpearce
bugs1339204
milestone54.0a1
Bug 1339204 - Adds support in StageFright for VP9.0 FourCCs r?cpearce MozReview-Commit-ID: 3YcMOCVT7DY
media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
media/libstagefright/frameworks/av/media/libstagefright/MediaDefs.cpp
--- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
@@ -261,16 +261,19 @@ static const char *FourCC2MIME(uint32_t 
 
         case FOURCC('a', 'v', 'c', '1'):
         case FOURCC('a', 'v', 'c', '3'):
             return MEDIA_MIMETYPE_VIDEO_AVC;
 
         case FOURCC('V', 'P', '6', 'F'):
             return MEDIA_MIMETYPE_VIDEO_VP6;
 
+        case FOURCC('v', 'p', '0', '9'):
+            return MEDIA_MIMETYPE_VIDEO_VP9;
+
         default:
             ALOGE("Unknown MIME type %08x", fourcc);
             return NULL;
     }
 }
 
 static bool AdjustChannelsAndRate(uint32_t fourcc, uint32_t *channels, uint32_t *rate) {
     const char* mime = FourCC2MIME(fourcc);
--- a/media/libstagefright/frameworks/av/media/libstagefright/MediaDefs.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MediaDefs.cpp
@@ -17,17 +17,17 @@
 #include <media/stagefright/MediaDefs.h>
 
 namespace stagefright {
 
 const char *MEDIA_MIMETYPE_IMAGE_JPEG = "image/jpeg";
 
 const char *MEDIA_MIMETYPE_VIDEO_VP6 = "video/x-vnd.on2.vp6";
 const char *MEDIA_MIMETYPE_VIDEO_VP8 = "video/x-vnd.on2.vp8";
-const char *MEDIA_MIMETYPE_VIDEO_VP9 = "video/x-vnd.on2.vp9";
+const char *MEDIA_MIMETYPE_VIDEO_VP9 = "video/vp9";
 const char *MEDIA_MIMETYPE_VIDEO_AVC = "video/avc";
 const char *MEDIA_MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es";
 const char *MEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp";
 const char *MEDIA_MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";
 const char *MEDIA_MIMETYPE_VIDEO_RAW = "video/raw";
 
 const char *MEDIA_MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
 const char *MEDIA_MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";