Update PPP side of Pepper CDM API to support video decoding.

This adds the PPP half of the video decoding support changes.

Adds the following pepper types:
- PP_VideoCodec
- PP_DecryptedFrameFormat
- PP_EncryptedVideoFrameInfo

Replaces PPP_ContentDecryptor_Private::DecryptAndDecode with
DecryptAndDecodeFrame.

BUG=141780
TEST=

Review URL: https://chromiumcodereview.appspot.com/11023004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160078 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 11 deletions

diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc
index 585f1fb..7dbce34 100644
--- a/ppapi/cpp/private/content_decryptor_private.cc
+++ b/ppapi/cpp/private/content_decryptor_private.cc
@@ -105,19 +105,20 @@ void Decrypt(PP_Instance instance,
       *encrypted_block_info);
 }
 
-void DecryptAndDecode(PP_Instance instance,
-                      PP_Resource encrypted_resource,
-                      const PP_EncryptedBlockInfo* encrypted_block_info) {
+void DecryptAndDecodeFrame(
+    PP_Instance instance,
+    PP_Resource encrypted_resource,
+    const PP_EncryptedVideoFrameInfo* encrypted_video_frame_info) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return;
 
-  pp::Buffer_Dev encrypted_block(pp::PassRef(), encrypted_resource);
+  pp::Buffer_Dev encrypted_frame(pp::PassRef(), encrypted_resource);
 
-  static_cast<ContentDecryptor_Private*>(object)->DecryptAndDecode(
-      encrypted_block,
-      *encrypted_block_info);
+  static_cast<ContentDecryptor_Private*>(object)->DecryptAndDecodeFrame(
+      encrypted_frame,
+      *encrypted_video_frame_info);
 }
 
 const PPP_ContentDecryptor_Private ppp_content_decryptor = {
@@ -125,7 +126,7 @@ const PPP_ContentDecryptor_Private ppp_content_decryptor = {
   &AddKey,
   &CancelKeyRequest,
   &Decrypt,
-  &DecryptAndDecode
+  &DecryptAndDecodeFrame
 };
 
 template <> const char* interface_name<PPB_ContentDecryptor_Private>() {
diff --git a/ppapi/cpp/private/content_decryptor_private.h b/ppapi/cpp/private/content_decryptor_private.h
index 3a88876..7a6189b 100644
--- a/ppapi/cpp/private/content_decryptor_private.h
+++ b/ppapi/cpp/private/content_decryptor_private.h
@@ -36,9 +36,9 @@ class ContentDecryptor_Private {
   virtual void CancelKeyRequest(const std::string& session_id) = 0;
   virtual void Decrypt(pp::Buffer_Dev encrypted_buffer,
                        const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
-  virtual void DecryptAndDecode(
-      pp::Buffer_Dev encrypted_buffer,
-      const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
+  virtual void DecryptAndDecodeFrame(
+      pp::Buffer_Dev encrypted_frame,
+      const PP_EncryptedVideoFrameInfo& encrypted_video_frame_info) = 0;
 
   // PPB_ContentDecryptor_Private methods for passing data from the decryptor
   // to the browser.