Update Pepper interface for EME

content/renderer/pepper/content_decryptor_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/content_decryptor_delegate.h"
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/numerics/safe_conversions.h"
 #include "content/renderer/pepper/ppb_buffer_impl.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/channel_layout.h"
 #include "media/base/data_buffer.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
+#include "ppapi/shared_impl/array_var.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/shared_impl/var_tracker.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_buffer_api.h"
 #include "ui/gfx/rect.h"
 
 using media::CdmPromise;
 using media::Decryptor;
+using media::KeyIdsPromise;
 using media::MediaKeys;
 using media::NewSessionCdmPromise;
 using media::SimpleCdmPromise;
 using ppapi::ArrayBufferVar;
+using ppapi::ArrayVar;
 using ppapi::PpapiGlobals;
 using ppapi::ScopedPPResource;
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
 
 namespace content {
 
 namespace {
 
@@ skipping 277 matching lines @@
 
   plugin_decryption_interface_->Initialize(
       pp_instance_, StringVar::StringToPPVar(key_system_));
 }
 
 void ContentDecryptorDelegate::InstanceCrashed() {
   fatal_plugin_error_cb_.Run();
   SatisfyAllPendingCallbacksOnError();
 }
 
+void ContentDecryptorDelegate::SetServerCertificate(
+    const uint8* certificate,
+    int certificate_length,
+    scoped_ptr<media::SimpleCdmPromise> promise) {
+  uint32_t promise_id = SavePromise(promise.PassAs<CdmPromise>());
+  PP_Var certificate_array =
+      PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
+          certificate_length, certificate);
+  plugin_decryption_interface_->SetServerCertificate(
+      pp_instance_, promise_id, certificate_array);
+}
+
 void ContentDecryptorDelegate::CreateSession(
     const std::string& init_data_type,
     const uint8* init_data,
     int init_data_length,
     MediaKeys::SessionType session_type,
     scoped_ptr<NewSessionCdmPromise> promise) {
   uint32_t promise_id = SavePromise(promise.PassAs<CdmPromise>());
   PP_Var init_data_array =
       PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
           init_data_length, init_data);
@@ skipping 22 matching lines @@
   PP_Var response_array =
       PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
           response_length, response);
   plugin_decryption_interface_->UpdateSession(
       pp_instance_,
       promise_id,
       StringVar::StringToPPVar(web_session_id),
       response_array);
 }
 
-void ContentDecryptorDelegate::ReleaseSession(
+void ContentDecryptorDelegate::GetUsableKeyIds(
+    const std::string& web_session_id,
+    scoped_ptr<media::KeyIdsPromise> promise) {
+  uint32_t promise_id = SavePromise(promise.PassAs<CdmPromise>());
+  plugin_decryption_interface_->GetUsableKeyIds(
+      pp_instance_, promise_id, StringVar::StringToPPVar(web_session_id));
+}
+
+void ContentDecryptorDelegate::CloseSession(
     const std::string& web_session_id,
     scoped_ptr<SimpleCdmPromise> promise) {
   uint32_t promise_id = SavePromise(promise.PassAs<CdmPromise>());
-  plugin_decryption_interface_->ReleaseSession(
+  plugin_decryption_interface_->CloseSession(
       pp_instance_, promise_id, StringVar::StringToPPVar(web_session_id));
 }
 
+void ContentDecryptorDelegate::RemoveSession(
+    const std::string& web_session_id,
+    scoped_ptr<SimpleCdmPromise> promise) {
+  uint32_t promise_id = SavePromise(promise.PassAs<CdmPromise>());
+  plugin_decryption_interface_->RemoveSession(
+      pp_instance_, promise_id, StringVar::StringToPPVar(web_session_id));
+}
+
 // TODO(xhwang): Remove duplication of code in Decrypt(),
 // DecryptAndDecodeAudio() and DecryptAndDecodeVideo().
 bool ContentDecryptorDelegate::Decrypt(
     Decryptor::StreamType stream_type,
     const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
     const Decryptor::DecryptCB& decrypt_cb) {
   DVLOG(3) << "Decrypt() - stream_type: " << stream_type;
 
   // |{audio|video}_input_resource_| is not being used by the plugin
   // now because there is only one pending audio/video decrypt request at any
@@ skipping 247 matching lines @@
   StringVar* web_session_id_string = StringVar::FromPPVar(web_session_id);
   DCHECK(web_session_id_string);
 
   if (promise) {
     NewSessionCdmPromise* session_promise(
         static_cast<NewSessionCdmPromise*>(promise.get()));
     session_promise->resolve(web_session_id_string->value());
   }
 }
 
+void ContentDecryptorDelegate::OnPromiseResolvedWithKeyIds(uint32 promise_id,
+                                                           PP_Var key_ids) {

[ddorwin, 2014/08/22 20:49:20]

..._array?

[jrummell, 2014/08/25 21:54:36]

Done.

+  scoped_ptr<CdmPromise> promise = TakePromise(promise_id);
+
+  ArrayVar* key_ids_array = ArrayVar::FromPPVar(key_ids);
+  media::KeyIdsVector key_ids_vector;
+  if (key_ids_array) {

[ddorwin, 2014/08/22 20:49:20]

DCHECK? Or can this be null if the array is empty? If the latter, you might
comment that. In either case, I we do need to handle the case in opt builds.

[jrummell, 2014/08/25 21:54:36]

Done.

+    for (size_t i = 0; i < key_ids_array->GetLength(); ++i) {
+      ArrayBufferVar* array_buffer =
+          ArrayBufferVar::FromPPVar(key_ids_array->Get(i));
+      if (array_buffer) {

[ddorwin, 2014/08/22 20:49:20]

DCHECK?

[jrummell, 2014/08/25 21:54:36]

Done.

+        std::vector<uint8> item;

[ddorwin, 2014/08/22 20:49:20]

How about key_id?

[jrummell, 2014/08/25 21:54:36]

Done.

+        const uint8* data = static_cast<const uint8*>(array_buffer->Map());
+        item.assign(data, data + array_buffer->ByteLength());
+        key_ids_vector.push_back(item);
+      }
+    }
+  }
+
+  if (promise) {

[ddorwin, 2014/08/22 20:49:20]

DCHECK?
I wonder why existing code does not have this? We shouldn't crash in opt builds,
but don't we want to know if we can't find the promise? Or is this some sort of
teardown issue?

[jrummell, 2014/08/25 21:54:36]

The other OnPromise...() do check that promise is valid. Probably a good idea to
verify with a DCHECK.

+    KeyIdsPromise* key_ids_promise(static_cast<KeyIdsPromise*>(promise.get()));

[ddorwin, 2014/08/22 20:49:20]

This promise ID is coming from a plugin process, which cannot be trusted. Maybe
we should be able to get the promise type.
I'm curious what dmichael has to say from a Pepper POV.

[jrummell, 2014/08/25 21:54:36]

Added type on CdmPromise so it can be verified.

+    key_ids_promise->resolve(key_ids_vector);
+  }
+}
+
 void ContentDecryptorDelegate::OnPromiseRejected(
     uint32 promise_id,
     PP_CdmExceptionCode exception_code,
     uint32 system_code,
     PP_Var error_description) {
   StringVar* error_description_string = StringVar::FromPPVar(error_description);
   DCHECK(error_description_string);
 
   scoped_ptr<CdmPromise> promise = TakePromise(promise_id);
   if (promise) {
@@ skipping 26 matching lines @@
   if (!verified_gurl.is_valid() && !verified_gurl.is_empty()) {
     DLOG(WARNING) << "SessionMessage default_url is invalid : "
                   << verified_gurl.possibly_invalid_spec();
     verified_gurl = GURL::EmptyGURL();  // Replace invalid destination_url.
   }
 
   session_message_cb_.Run(
       web_session_id_string->value(), message_vector, verified_gurl);
 }
 
+void ContentDecryptorDelegate::OnSessionKeysChange(
+    PP_Var web_session_id,
+    PP_Bool has_additional_usable_key) {
+  // TODO(jrummell): Pass this event on.
+}
+
+void ContentDecryptorDelegate::OnSessionExpirationChange(
+    PP_Var web_session_id,
+    PP_Time new_expiry_time) {
+  // TODO(jrummell): Pass this event on.
+}
+
 void ContentDecryptorDelegate::OnSessionReady(PP_Var web_session_id) {
   if (session_ready_cb_.is_null())
     return;
 
   StringVar* web_session_id_string = StringVar::FromPPVar(web_session_id);
   DCHECK(web_session_id_string);
 
   session_ready_cb_.Run(web_session_id_string->value());
 }
 
@@ skipping 468 matching lines @@
 
 scoped_ptr<CdmPromise> ContentDecryptorDelegate::TakePromise(
     uint32_t promise_id) {
   PromiseMap::iterator it = promises_.find(promise_id);
   if (it == promises_.end())
     return scoped_ptr<CdmPromise>();
   return promises_.take_and_erase(it);
 }
 
 }  // namespace content