EME v0.1: Report defaultURL in KeyMessage.

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 <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>
@@ skipping 167 matching lines @@
 
 void ClearKeyCdm::Client::KeyMessage(const std::string& key_system,
                                      const std::string& session_id,
                                      scoped_array<uint8> message,
                                      int message_length,
                                      const std::string& default_url) {
   status_ = kKeyMessage;
   session_id_ = session_id;
   key_message_ = message.Pass();
   key_message_length_ = message_length;
+  default_url_ = default_url;
 }
 
 void ClearKeyCdm::Client::NeedKey(const std::string& key_system,
                                   const std::string& session_id,
                                   const std::string& type,
                                   scoped_array<uint8> init_data,
                                   int init_data_length) {
   // In the current implementation of AesDecryptor, NeedKey is not used.
   // If no key is available to decrypt an input buffer, it returns kNoKey to
   // the caller instead of firing NeedKey.
@@ skipping 88 matching lines @@
 
 void ClearKeyCdm::TimerExpired(cdm::KeyMessage* msg, bool* populated) {
   std::ostringstream msg_stream;
   msg_stream << kHeartBeatHeader << " from ClearKey CDM at time "
              << cdm_host_->GetCurrentWallTimeInSeconds() << ".";
   std::string msg_string = msg_stream.str();
 
   msg->set_message(allocator_->Allocate(msg_string.length()));
   memcpy(msg->message()->data(), msg_string.data(), msg_string.length());
   msg->set_session_id(latest_session_id_.data(), latest_session_id_.length());
-  msg->set_default_url(NULL, 0);
+  const char url[] = "http://externalclearkey.chromium.org";
+  msg->set_default_url(url, arraysize(url));
 
   *populated = true;
 
   cdm_host_->SetTimer(timer_delay_ms_);
 
   // Use a smaller timer delay at start-up to facilitate testing. Increase the
   // timer delay up to a limit to avoid message spam.
   if (timer_delay_ms_ < kMaxTimerDelayMs)
     timer_delay_ms_ = std::min(2 * timer_delay_ms_, kMaxTimerDelayMs);
 }
@@ skipping 235 matching lines @@
   int samples_generated = GenerateFakeAudioFramesFromDuration(
       timestamp_in_microseconds - CurrentTimeStampInMicroseconds(),
       audio_frames);
   total_samples_generated_ += samples_generated;
 
   return samples_generated == 0 ? cdm::kNeedMoreData : cdm::kSuccess;
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
 }  // namespace webkit_media