Changes to the EME Pepper API

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/safe_numerics.h"
@@ skipping 225 matching lines @@
       weak_this_(weak_ptr_factory_.GetWeakPtr()),
       audio_sample_format_(media::kUnknownSampleFormat),
       audio_samples_per_second_(0),
       audio_channel_count_(0),
       audio_bytes_per_frame_(0) {
 }
 
 ContentDecryptorDelegate::~ContentDecryptorDelegate() {
 }
 
-void ContentDecryptorDelegate::Initialize(const std::string& key_system) {
-  // TODO(ddorwin): Add an Initialize method to PPP_ContentDecryptor_Private.
+void ContentDecryptorDelegate::Initialize(
+    const std::string& key_system,
+    const PP_KeySystemFlags key_system_flags) {

[DaleCurtis, 2013/09/18 21:29:30]

const&

[jrummell, 2013/09/19 00:37:28]

Done.

   DCHECK(!key_system.empty());
+  DCHECK(key_system_.empty());
+

[ddorwin, 2013/09/18 21:26:53]

nit: I would put this after the assignment, which is separate from Initialize()

[jrummell, 2013/09/19 00:37:28]

Done.

   key_system_ = key_system;
+  plugin_decryption_interface_->Initialize(
+      pp_instance_,
+      StringVar::StringToPPVar(key_system_),
+      &key_system_flags);

[ddorwin, 2013/09/18 21:26:53]

Why address of? It's input only.

[jrummell, 2013/09/19 00:37:28]

The .idl generated interface is const struct PP_CdmConfigurationFlags* (in
ppapi/c/private/ppp_content_decryptor_private.h).

 }
 
 void ContentDecryptorDelegate::SetKeyEventCallbacks(
     const media::KeyAddedCB& key_added_cb,
     const media::KeyErrorCB& key_error_cb,
     const media::KeyMessageCB& key_message_cb) {
   key_added_cb_ = key_added_cb;
   key_error_cb_ = key_error_cb;
   key_message_cb_ = key_message_cb;
 }
 
 bool ContentDecryptorDelegate::GenerateKeyRequest(const std::string& type,
                                                   const uint8* init_data,
                                                   int init_data_length) {
   PP_Var init_data_array =
       PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
           init_data_length, init_data);
 
   plugin_decryption_interface_->GenerateKeyRequest(
       pp_instance_,
-      StringVar::StringToPPVar(key_system_),  // TODO(ddorwin): Remove.
       StringVar::StringToPPVar(type),
       init_data_array);
   return true;
 }
 
 bool ContentDecryptorDelegate::AddKey(const std::string& session_id,
                                       const uint8* key,
                                       int key_length,
                                       const uint8* init_data,
                                       int init_data_length) {
@@ skipping 761 matching lines @@
     frames->push_back(frame);
 
     cur += frame_size;
     bytes_left -= frame_size;
   } while (bytes_left > 0);
 
   return true;
 }
 
 }  // namespace content