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

3 files changed, 26 insertions, 8 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
 };
 
 /**
diff --git a/ppapi/c/private/pp_content_decryptor.h b/ppapi/c/private/pp_content_decryptor.h
index 283ad92..66011f4 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 Sat Oct 20 00:59:20 2012. */
+/* From private/pp_content_decryptor.idl modified Thu Oct 25 16:40:07 2012. */
 
 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
@@ -259,7 +259,8 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DecryptedFrameInfo, 56);
  */
 typedef enum {
   PP_AUDIOCODEC_UNKNOWN = 0,
-  PP_AUDIOCODEC_VORBIS = 1
+  PP_AUDIOCODEC_VORBIS = 1,
+  PP_AUDIOCODEC_AAC = 2
 } PP_AudioCodec;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_AudioCodec, 4);
 /**
@@ -316,7 +317,8 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_AudioDecoderConfig, 20);
  */
 typedef enum {
   PP_VIDEOCODEC_UNKNOWN = 0,
-  PP_VIDEOCODEC_VP8 = 1
+  PP_VIDEOCODEC_VP8 = 1,
+  PP_VIDEOCODEC_H264 = 2
 } PP_VideoCodec;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodec, 4);
 
@@ -327,7 +329,14 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodec, 4);
  */
 typedef enum {
   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
 } PP_VideoCodecProfile;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodecProfile, 4);
 /**
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index 6b7f4ec..cec1eab 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* Last generated from IDL: Mon Oct 22 19:49:47 2012. */
+/* Last generated from IDL: Thu Oct 25 16:40:11 2012. */
 #include "ppapi/generators/pnacl_shim.h"
 
 #include "ppapi/c/ppb.h"