diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 23:33:52 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 23:33:52 +0000 |
| commit | 2b197ac7ab2c85d0ffaba55cc0bdb5e8aca7e0f1 (patch) | |
| tree | 7cdfb034913ec2453534d01a65935c15065d9749 /ppapi | |
| parent | 8cdeef67a965b1671c7826ee621c3458620c9aee (diff) | |
| download | chromium_src-2b197ac7ab2c85d0ffaba55cc0bdb5e8aca7e0f1.zip chromium_src-2b197ac7ab2c85d0ffaba55cc0bdb5e8aca7e0f1.tar.gz chromium_src-2b197ac7ab2c85d0ffaba55cc0bdb5e8aca7e0f1.tar.bz2 | |
Encrypted Media: Support VP9 playback.
Also adds a browser test with encrypted VP9 video. The test video file is checked in a separate CL.
IsTypeSupported() doesn't work with VP9 yet, which will be fixed in a followup CL.
BUG=361318
Review URL: https://codereview.chromium.org/234813008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/api/private/pp_content_decryptor.idl | 5 | ||||
| -rw-r--r-- | ppapi/c/private/pp_content_decryptor.h | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ppapi/api/private/pp_content_decryptor.idl b/ppapi/api/private/pp_content_decryptor.idl index ac9e88b..16be86e 100644 --- a/ppapi/api/private/pp_content_decryptor.idl +++ b/ppapi/api/private/pp_content_decryptor.idl @@ -326,7 +326,8 @@ struct PP_AudioDecoderConfig { enum PP_VideoCodec { PP_VIDEOCODEC_UNKNOWN = 0, PP_VIDEOCODEC_VP8 = 1, - PP_VIDEOCODEC_H264 = 2 + PP_VIDEOCODEC_H264 = 2, + PP_VIDEOCODEC_VP9 = 3 }; /** @@ -337,7 +338,7 @@ enum PP_VideoCodec { [assert_size(4)] enum PP_VideoCodecProfile { PP_VIDEOCODECPROFILE_UNKNOWN = 0, - PP_VIDEOCODECPROFILE_VP8_MAIN = 1, + PP_VIDEOCODECPROFILE_NOT_NEEDED = 1, PP_VIDEOCODECPROFILE_H264_BASELINE = 2, PP_VIDEOCODECPROFILE_H264_MAIN = 3, PP_VIDEOCODECPROFILE_H264_EXTENDED = 4, diff --git a/ppapi/c/private/pp_content_decryptor.h b/ppapi/c/private/pp_content_decryptor.h index 6440ce1..bdee6ed 100644 --- a/ppapi/c/private/pp_content_decryptor.h +++ b/ppapi/c/private/pp_content_decryptor.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From private/pp_content_decryptor.idl modified Mon Dec 30 15:55:57 2013. */ +/* From private/pp_content_decryptor.idl modified Wed Apr 9 10:36:52 2014. */ #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ @@ -366,7 +366,8 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_AudioDecoderConfig, 20); typedef enum { PP_VIDEOCODEC_UNKNOWN = 0, PP_VIDEOCODEC_VP8 = 1, - PP_VIDEOCODEC_H264 = 2 + PP_VIDEOCODEC_H264 = 2, + PP_VIDEOCODEC_VP9 = 3 } PP_VideoCodec; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodec, 4); @@ -377,7 +378,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodec, 4); */ typedef enum { PP_VIDEOCODECPROFILE_UNKNOWN = 0, - PP_VIDEOCODECPROFILE_VP8_MAIN = 1, + PP_VIDEOCODECPROFILE_NOT_NEEDED = 1, PP_VIDEOCODECPROFILE_H264_BASELINE = 2, PP_VIDEOCODECPROFILE_H264_MAIN = 3, PP_VIDEOCODECPROFILE_H264_EXTENDED = 4, |