diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 02:08:48 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 02:08:48 +0000 |
| commit | 4967628dc7fd0ab09d3cdfdd16bd0445bacb07b6 (patch) | |
| tree | d8f42a47705c4ca83cf8138bf4cdbd0425883a88 /ppapi/api | |
| parent | cb2233a0acbb93b28d176ef6c9d2a53da8331fc8 (diff) | |
| download | chromium_src-4967628dc7fd0ab09d3cdfdd16bd0445bacb07b6.zip chromium_src-4967628dc7fd0ab09d3cdfdd16bd0445bacb07b6.tar.gz chromium_src-4967628dc7fd0ab09d3cdfdd16bd0445bacb07b6.tar.bz2 | |
Add support for additional a/v decoders to Pepper CDM API.
- Add audio codec AAC.
- Add video codec H264.
- Add H264 profiles.
TEST=encrypted MP4 files play through External Clear Key
Review URL: https://chromiumcodereview.appspot.com/11274065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/api')
| -rw-r--r-- | ppapi/api/private/pp_content_decryptor.idl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ppapi/api/private/pp_content_decryptor.idl b/ppapi/api/private/pp_content_decryptor.idl index 83d6c31..8681cfd 100644 --- a/ppapi/api/private/pp_content_decryptor.idl +++ b/ppapi/api/private/pp_content_decryptor.idl @@ -225,7 +225,8 @@ struct PP_DecryptedFrameInfo { [assert_size(4)] enum PP_AudioCodec { PP_AUDIOCODEC_UNKNOWN = 0, - PP_AUDIOCODEC_VORBIS = 1 + PP_AUDIOCODEC_VORBIS = 1, + PP_AUDIOCODEC_AAC = 2 }; /** @@ -272,7 +273,8 @@ struct PP_AudioDecoderConfig { [assert_size(4)] enum PP_VideoCodec { PP_VIDEOCODEC_UNKNOWN = 0, - PP_VIDEOCODEC_VP8 = 1 + PP_VIDEOCODEC_VP8 = 1, + PP_VIDEOCODEC_H264 = 2 }; /** @@ -283,7 +285,14 @@ enum PP_VideoCodec { [assert_size(4)] enum PP_VideoCodecProfile { PP_VIDEOCODECPROFILE_UNKNOWN = 0, - PP_VIDEOCODECPROFILE_VP8_MAIN = 1 + PP_VIDEOCODECPROFILE_VP8_MAIN = 1, + PP_VIDEOCODECPROFILE_H264_BASELINE = 2, + PP_VIDEOCODECPROFILE_H264_MAIN = 3, + PP_VIDEOCODECPROFILE_H264_EXTENDED = 4, + PP_VIDEOCODECPROFILE_H264_HIGH = 5, + PP_VIDEOCODECPROFILE_H264_HIGH_10 = 6, + PP_VIDEOCODECPROFILE_H264_HIGH_422 = 7, + PP_VIDEOCODECPROFILE_H264_HIGH_444_PREDICTIVE = 8 }; /** |