Generalize Pepper CDM API decrypt and decode.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index e6d0eeeef7bc34e270c52e5f11db130db19aee18..1176089ffbe7731168cae7bb51d97f7ad500b84d 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1547,42 +1547,41 @@ bool PluginInstance::Decrypt(
 }
 
 // Note: this method can be used with an unencrypted frame.
-bool PluginInstance::DecryptAndDecodeFrame(
-    const scoped_refptr<media::DecoderBuffer>& encrypted_frame,
+bool PluginInstance::DecryptAndDecode(
+    const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
     const media::Decryptor::DecryptCB& decrypt_cb) {
   if (!LoadContentDecryptorInterface())
     return false;
 
   ScopedPPResource encrypted_resource(MakeBufferResource(
       pp_instance(),
-      encrypted_frame->GetData(),
-      encrypted_frame->GetDataSize()));
+      encrypted_buffer->GetData(),
+      encrypted_buffer->GetDataSize()));
   if (!encrypted_resource.get())
     return false;
 
   const uint32_t request_id = next_decryption_request_id_++;
 
-  // TODO(tomfinegan): Need to get the video format information here somehow.
-  PP_EncryptedVideoFrameInfo frame_info;
-  frame_info.width = 0;
-  frame_info.height = 0;
-  frame_info.format = PP_DECRYPTEDFRAMEFORMAT_UNKNOWN;
-  frame_info.codec = PP_VIDEOCODEC_UNKNOWN;
+  PP_EncryptedMediaInfo media_info;
+
+  // TODO(tomfinegan): Need to get |media_type| from media stack.
+  media_info.media_type = PP_STREAMTYPE_UNKNOWN;

[Ami GONE FROM CHROMIUM, 2012/10/10 07:30:26]

shouldn't this be VIDEO until AUDIO support is added?

[Tom Finegan, 2012/10/10 08:26:06]

Done.

+
 
-  DCHECK(encrypted_frame->GetDecryptConfig());
-  if (!MakeEncryptedBlockInfo(*encrypted_frame->GetDecryptConfig(),
-                              encrypted_frame->GetTimestamp().InMicroseconds(),
+  DCHECK(encrypted_buffer->GetDecryptConfig());
+  if (!MakeEncryptedBlockInfo(*encrypted_buffer->GetDecryptConfig(),
+                              encrypted_buffer->GetTimestamp().InMicroseconds(),
                               request_id,
-                              &frame_info.encryption_info)) {
+                              &media_info.encryption_info)) {
     return false;
   }
 
   DCHECK(!ContainsKey(pending_decryption_cbs_, request_id));
   pending_decryption_cbs_.insert(std::make_pair(request_id, decrypt_cb));
 
-  plugin_decryption_interface_->DecryptAndDecodeFrame(pp_instance(),
-                                                      encrypted_resource,
-                                                      &frame_info);
+  plugin_decryption_interface_->DecryptAndDecode(pp_instance(),
+                                                 encrypted_resource,
+                                                 &media_info);
   return true;
 }