Move OnNeedKey() to WebMediaPlayerImpl.

media/blink/webmediaplayer_impl.cc

 // 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.
 
 #include "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 42 matching lines @@
 #include "media/filters/opus_audio_decoder.h"
 #include "media/filters/renderer_impl.h"
 #include "media/filters/video_renderer_impl.h"
 #include "media/filters/vpx_video_decoder.h"
 #include "third_party/WebKit/public/platform/WebMediaSource.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using blink::WebCanvas;
 using blink::WebMediaPlayer;
 using blink::WebRect;
 using blink::WebSize;
 using blink::WebString;
 
 namespace {
@@ skipping 577 matching lines @@
   video_frame->UpdateReleaseSyncPoint(&client);
   return true;
 }
 
 WebMediaPlayer::MediaKeyException
 WebMediaPlayerImpl::generateKeyRequest(const WebString& key_system,
                                        const unsigned char* init_data,
                                        unsigned init_data_length) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
+  // TODO(xhwang): We assume all streams are from the same container (thus have

[ddorwin, 2014/12/02 20:49:49]

Note: YouTube is currently violating this assumption.

[xhwang, 2014/12/02 21:57:47]

Acknowledged.

+  // the same "type") for now. In the future, the "type" should be passed down

[ddorwin, 2014/12/02 20:49:49]

ditto

[xhwang, 2014/12/02 21:57:47]

Done.

+  // from the application.
   return encrypted_media_support_.GenerateKeyRequest(
-      frame_, key_system, init_data, init_data_length);
+      frame_, key_system, init_data_type_, init_data, init_data_length);
 }
 
 WebMediaPlayer::MediaKeyException WebMediaPlayerImpl::addKey(
     const WebString& key_system,
     const unsigned char* key,
     unsigned key_length,
     const unsigned char* init_data,
     unsigned init_data_length,
     const WebString& session_id) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ skipping 20 matching lines @@
     result.completeWithError(
         blink::WebContentDecryptionModuleExceptionNotSupportedError, 0,
         "Null MediaKeys object is not supported.");
     return;
   }
 
   SetCdm(ToWebContentDecryptionModuleImpl(cdm)->GetCdmContext(),
          BIND_TO_RENDER_LOOP1(&WebMediaPlayerImpl::OnCdmAttached, result));
 }
 
+void WebMediaPlayerImpl::OnNeedKey(const std::string& type,

[ddorwin, 2014/12/02 20:49:49]

i_d_t

[xhwang, 2014/12/02 21:57:47]

Done.

+                                   const std::vector<uint8>& init_data) {
+  // Do not fire NeedKey event if encrypted media is not enabled.

[ddorwin, 2014/12/02 20:49:49]

I know this was copied, but should client_ be handling this instead? Maybe a
future CL.

[xhwang, 2014/12/02 21:57:47]

Added TODO.

+  if (!blink::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled() &&
+      !blink::WebRuntimeFeatures::isEncryptedMediaEnabled()) {
+    return;
+  }
+
+  UMA_HISTOGRAM_COUNTS("Media.EME.NeedKey", 1);
+
+  DCHECK(init_data_type_.empty() || type.empty() || type == init_data_type_);

[ddorwin, 2014/12/02 20:49:49]

Can type be empty? The demuxers that call this always know their IDT.

[ddorwin, 2014/12/02 20:49:49]

YouTube currently violates this without problems in opt builds. Since the
condition does not indicate a code bug, maybe we should replace it with a
DLOG_IF() or NOTSUPPORTED(), assuming that just logs.

[xhwang, 2014/12/02 21:57:47]

Good catch. Done.

[xhwang, 2014/12/02 21:57:47]

Done.

+  if (init_data_type_.empty())
+    init_data_type_ = type;
+
+  const uint8* init_data_ptr = init_data.empty() ? nullptr : &init_data[0];
+  client_->encrypted(WebString::fromUTF8(type), init_data_ptr,
+                     base::saturated_cast<unsigned int>(init_data.size()));
+}
+
 void WebMediaPlayerImpl::SetCdm(CdmContext* cdm_context,
                                 const CdmAttachedCB& cdm_attached_cb) {
   pipeline_.SetCdm(cdm_context, cdm_attached_cb);
 }
 
 void WebMediaPlayerImpl::OnCdmAttached(
     blink::WebContentDecryptionModuleResult result,
     bool success) {
   if (success) {
     result.complete();
@@ skipping 191 matching lines @@
 
 void WebMediaPlayerImpl::StartPipeline() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   // Keep track if this is a MSE or non-MSE playback.
   UMA_HISTOGRAM_BOOLEAN("Media.MSE.Playback",
                         (load_type_ == LoadTypeMediaSource));
 
   LogCB mse_log_cb;
   Demuxer::NeedKeyCB need_key_cb =
-      encrypted_media_support_.CreateNeedKeyCB();
+      BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey);
 
   // Figure out which demuxer to use.
   if (load_type_ != LoadTypeMediaSource) {
     DCHECK(!chunk_demuxer_);
     DCHECK(data_source_);
 
     demuxer_.reset(new FFmpegDemuxer(
         media_task_runner_, data_source_.get(),
         need_key_cb,
         media_log_));
@@ skipping 127 matching lines @@
   compositor_task_runner_->PostTask(FROM_HERE,
                                     base::Bind(&GetCurrentFrameAndSignal,
                                                base::Unretained(compositor_),
                                                &video_frame,
                                                &event));
   event.Wait();
   return video_frame;
 }
 
 }  // namespace media