Update Pepper interface for EME

media/cdm/ppapi/cdm_wrapper.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_CDM_PPAPI_CDM_WRAPPER_H_
 #define MEDIA_CDM_PPAPI_CDM_WRAPPER_H_
 
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 24 matching lines @@
 // (just a shim layer in most cases), everything is done in this header file.
 class CdmWrapper {
  public:
   static CdmWrapper* Create(const char* key_system,
                             uint32_t key_system_size,
                             GetCdmHostFunc get_cdm_host_func,
                             void* user_data);
 
   virtual ~CdmWrapper() {};
 
+  virtual bool SetServerCertificate(uint32_t promise_id,

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

Is there a reason this has a return value?
Should it be removed when CDM_4/5 are no longer supported?
I may have asked this before, but can we just reject the promise here instead?
(I think the answer is that we don't have a host pointer, so no.)

Ditto on some of the other existing methods.

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

You are correct. Added comment to match other methods (which were updated in a
CL over the weekend).

+                                    const uint8_t* server_certificate_data,
+                                    uint32_t server_certificate_data_size) = 0;
   virtual void CreateSession(uint32_t promise_id,
                              const char* init_data_type,
                              uint32_t init_data_type_size,
                              const uint8_t* init_data,
                              uint32_t init_data_size,
                              cdm::SessionType session_type) = 0;
   virtual void LoadSession(uint32_t promise_id,
                            const char* web_session_id,
                            uint32_t web_session_id_size) = 0;
   virtual void UpdateSession(uint32_t promise_id,
@@ skipping 111 matching lines @@
 
   // Returns true if |data| is prefixed with |header| and has data after the
   // |header|.
   bool HasHeader(const uint8* data,
                  int data_length,
                  const std::string& header) {
     return static_cast<size_t>(data_length) > header.length() &&
            std::equal(data, data + header.length(), header.begin());
   }
 
+  virtual bool SetServerCertificate(
+      uint32_t promise_id,
+      const uint8_t* server_certificate_data,
+      uint32_t server_certificate_data_size) OVERRIDE {
+    cdm_->SetServerCertificate(
+        promise_id, server_certificate_data, server_certificate_data_size);
+    return true;
+  }
+
   virtual void CreateSession(uint32_t promise_id,
                              const char* init_data_type,
                              uint32_t init_data_type_size,
                              const uint8_t* init_data,
                              uint32_t init_data_size,
                              cdm::SessionType session_type) OVERRIDE {
     // TODO(jrummell): Remove this code once |session_type| is passed through
     // Pepper. When removing, add the header back in for CDM4.
     PP_DCHECK(session_type == cdm::kTemporary);
     const char kPersistentSessionHeader[] = "PERSISTENT|";
@@ skipping 211 matching lines @@
 // LoadSession(), UpdateSession(), and ReleaseSession() pass in promise ids,
 // but the CDM interface needs session ids. For create and load, we need to
 // create a new session_id to pass to the CDM. For update and release, we need
 // to look up |web_session_id| and convert it into the existing |session_id|.
 // Since the callbacks don't come through this interface, cdm_adapter needs to
 // create the mapping (and delete it on release). Finally, for create, we need
 // to translate |init_data_type| to a MIME type.
 // TODO(jrummell): Remove these once Host_4 interface is removed.
 
 template <>
+bool CdmWrapperImpl<cdm::ContentDecryptionModule_4>::SetServerCertificate(
+    uint32_t promise_id,
+    const uint8_t* server_certificate_data,
+    uint32_t server_certificate_data_size) {
+  return false;
+}
+
+template <>
 void CdmWrapperImpl<cdm::ContentDecryptionModule_4>::CreateSession(
     uint32_t promise_id,
     const char* init_data_type,
     uint32_t init_data_type_size,
     const uint8_t* init_data,
     uint32_t init_data_size,
     cdm::SessionType session_type) {
   uint32_t session_id = CreateSessionId();
   RegisterPromise(session_id, promise_id);
   std::string converted_init_data_type = ConvertInitDataTypeToContentType(
@@ skipping 89 matching lines @@
     cdm::AudioFrames* audio_frames) {
   cdm::InputBuffer_1 buffer;
   ConvertInputBuffer(encrypted_buffer, &buffer);
   return cdm_->DecryptAndDecodeSamples(buffer, audio_frames);
 }
 
 // Overrides for the cdm::Host_5 methods.
 // TODO(jrummell): Remove these once Host_5 interface is removed.
 
 template <>
+bool CdmWrapperImpl<cdm::ContentDecryptionModule_5>::SetServerCertificate(
+    uint32_t promise_id,
+    const uint8_t* server_certificate_data,
+    uint32_t server_certificate_data_size) {
+  return false;
+}
+
+template <>
 void CdmWrapperImpl<cdm::ContentDecryptionModule_5>::CreateSession(
     uint32_t promise_id,
     const char* init_data_type,
     uint32_t init_data_type_size,
     const uint8_t* init_data,
     uint32_t init_data_size,
     cdm::SessionType session_type) {
   std::string converted_init_data_type = ConvertInitDataTypeToContentType(
       std::string(init_data_type, init_data_type_size));
   // TODO(jrummell): Remove this code once |session_type| is passed through
@@ skipping 142 matching lines @@
 // stub implementations for new or modified methods that the older CDM interface
 // does not have.
 // Also update supported_cdm_versions.h.
 COMPILE_ASSERT(cdm::ContentDecryptionModule::kVersion ==
                    cdm::ContentDecryptionModule_6::kVersion,
                ensure_cdm_wrapper_templates_have_old_version_support);
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_CDM_WRAPPER_H_