Add type argument to pepper content decryptor method GenerateKeyRequest().

webkit/media/crypto/ppapi/clear_key_cdm.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 "webkit/media/crypto/ppapi/clear_key_cdm.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 37 matching lines @@
   // and call |av_register_all()| from there.
   av_register_all();
 
   return true;
 }
 
 static bool g_cdm_module_initialized = InitializeFFmpegLibraries();
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
 static const char kClearKeyCdmVersion[] = "0.1.0.0";
+static const char kExternalClearKey[] = "org.chromium.externalclearkey";
 
 // Copies |input_buffer| into a media::DecoderBuffer. If the |input_buffer| is
 // empty, an empty (end-of-stream) media::DecoderBuffer is returned.
 static scoped_refptr<media::DecoderBuffer> CopyDecoderBufferFrom(
     const cdm::InputBuffer& input_buffer) {
   if (!input_buffer.data) {
     DCHECK_EQ(input_buffer.data_size, 0);
     return media::DecoderBuffer::CreateEOSBuffer();
   }
 
@@ skipping 35 matching lines @@
 };
 
 template<typename Type>
 static Type* AllocateAndCopy(const Type* data, int size) {
   COMPILE_ASSERT(sizeof(Type) == 1, type_size_is_not_one);
   Type* copy = new Type[size];
   memcpy(copy, data, size);
   return copy;
 }
 
-cdm::ContentDecryptionModule* CreateCdmInstance(
-    cdm::Allocator* allocator, cdm::CdmHost* host) {
+cdm::ContentDecryptionModule* CreateCdmInstance(const char* key_system_arg,
+                                                int key_system_size,
+                                                cdm::Allocator* allocator,
+                                                cdm::CdmHost* host) {
   DVLOG(1) << "CreateCdmInstance()";
+
+  const std::string key_system(key_system_arg, key_system_size);
+  const std::string kExternalClearKeyString = kExternalClearKey;

[xhwang, 2012/10/26 23:39:15]

does this work at all? 
DCHECK_EQ(key_system, kExternalClearKey)

If not then nevermind.

[ddorwin, 2012/10/26 23:47:46]

Whatever the case, we shouldn't create a std::string.

[Tom Finegan, 2012/10/26 23:52:25]

Didn't even try... compiles/works fine, done.

+  DCHECK_EQ(key_system, kExternalClearKeyString);

[ddorwin, 2012/10/26 23:47:46]

As discussed offline.

+
   return new webkit_media::ClearKeyCdm(allocator, host);
 }
 
 void DestroyCdmInstance(cdm::ContentDecryptionModule* instance) {
   DVLOG(1) << "DestroyCdmInstance()";
   delete instance;
 }
 
 const char* GetCdmVersion() {
   return kClearKeyCdmVersion;
@@ skipping 56 matching lines @@
   channel_count_ = 0;
   bits_per_channel_ = 0;
   samples_per_second_ = 0;
   last_timestamp_ = media::kNoTimestamp();
   last_duration_ = media::kInfiniteDuration();
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 }
 
 ClearKeyCdm::~ClearKeyCdm() {}
 
-cdm::Status ClearKeyCdm::GenerateKeyRequest(const uint8_t* init_data,
+cdm::Status ClearKeyCdm::GenerateKeyRequest(const char* /* type */,
+                                            int /* type_size */,
+                                            const uint8_t* init_data,
                                             int init_data_size,
                                             cdm::KeyMessage* key_request) {
   DVLOG(1) << "GenerateKeyRequest()";
   base::AutoLock auto_lock(client_lock_);
   ScopedResetter<Client> auto_resetter(&client_);
-  decryptor_.GenerateKeyRequest("", init_data, init_data_size);
+
+  // TODO(tomfinegan): Extend the Decryptor interface for passing |type|.
+  const std::string key_system = kExternalClearKey;
+  decryptor_.GenerateKeyRequest(key_system, init_data, init_data_size);

[xhwang, 2012/10/26 23:39:15]

nit: pass in kExternalClearKey directly?

[Tom Finegan, 2012/10/26 23:52:25]

Done.

 
   if (client_.status() != Client::kKeyMessage)
     return cdm::kSessionError;
 
   DCHECK(key_request);
   key_request->set_session_id(client_.session_id().data(),
                               client_.session_id().size());
 
   // TODO(tomfinegan): Get rid of this copy.
   key_request->set_message(allocator_->Allocate(client_.key_message_length()));
@@ skipping 328 matching lines @@
 
   static unsigned char color = 0;
   color += 10;
 
   memset(reinterpret_cast<void*>(video_frame->frame_buffer()->data()),
          color, frame_size);
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 
 }  // namespace webkit_media