Encrypted Media: Support Audio Decrypt-Only.

webkit/media/webmediaplayer_impl.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/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 134 matching lines @@
       pending_seek_(false),
       pending_seek_seconds_(0.0f),
       client_(client),
       proxy_(new WebMediaPlayerProxy(main_loop_->message_loop_proxy(), this)),
       delegate_(delegate),
       media_stream_client_(media_stream_client),
       media_log_(media_log),
       accelerated_compositing_reported_(false),
       incremented_externally_allocated_memory_(false),
       audio_source_provider_(audio_source_provider),
       audio_renderer_sink_(audio_renderer_sink),

[ddorwin, 2012/12/13 23:09:43]

Is there a reason for this member if we will pass ownership to
AudioRendererImpl? Maybe we can eliminate the shared_ptr altogether in a
subsequent CL.

[scherkus (not reviewing), 2012/12/13 23:39:07]

there is a lot of silliness w.r.t. audio_source_provider_ and
audio_renderer_sink_, see
https://code.google.com/p/chromium/issues/detail?id=136442

       is_local_source_(false),
       supports_save_(true),
       starting_(false) {
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 
   scoped_refptr<base::MessageLoopProxy> pipeline_message_loop =
       message_loop_factory_->GetMessageLoop(
           media::MessageLoopFactory::kPipeline);
   pipeline_ = new media::Pipeline(pipeline_message_loop, media_log_);
@@ skipping 15 matching lines @@
   // Create default video renderer.
   scoped_refptr<media::VideoRendererBase> video_renderer =
       new media::VideoRendererBase(
           pipeline_message_loop,
           base::Bind(&WebMediaPlayerProxy::Repaint, proxy_),
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
           true);
   filter_collection_->AddVideoRenderer(video_renderer);
   proxy_->set_frame_provider(video_renderer);
 
-  // Create default audio renderer using the null sink if no sink was provided.
-  if (!audio_renderer_sink) {
-    audio_renderer_sink = new media::NullAudioSink();
-  }
-  filter_collection_->AddAudioRenderer(
-      new media::AudioRendererImpl(audio_renderer_sink));
-
+  media::SetDecryptorReadyCB set_decryptor_ready_cb;
   if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) {
     decryptor_.reset(new ProxyDecryptor(message_loop_factory_->GetMessageLoop(
         media::MessageLoopFactory::kPipeline), proxy_.get(), client, frame));
+    set_decryptor_ready_cb =
+        base::Bind(&ProxyDecryptor::RegisterDecryptorReadyNotification,

[ddorwin, 2012/12/13 23:09:43]

Name needs to be updated per other CL.

[xhwang, 2012/12/14 03:16:21]

Done.

+                   base::Unretained(decryptor_.get()));
   }
+
+  // Create default audio renderer using the null sink if no sink was provided.

[ddorwin, 2012/12/13 23:09:43]

This is a change in behavior. Why? OR, how did this used to work?

[xhwang, 2012/12/14 03:16:21]

Please see: https://codereview.chromium.org/11564007/

+  if (!audio_renderer_sink)
+    audio_renderer_sink = new media::NullAudioSink();
+
+  filter_collection_->AddAudioRenderer(new media::AudioRendererImpl(
+      audio_renderer_sink, set_decryptor_ready_cb));
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   Destroy();
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_DESTROYED));
 
   if (delegate_)
     delegate_->PlayerGone(this);
@@ skipping 908 matching lines @@
   else if (is_downloading && network_state_ == WebMediaPlayer::NetworkStateIdle)
     SetNetworkState(WebMediaPlayer::NetworkStateLoading);
   media_log_->AddEvent(
       media_log_->CreateBooleanEvent(
           media::MediaLogEvent::NETWORK_ACTIVITY_SET,
           "is_downloading_data", is_downloading));
 }
 
 void WebMediaPlayerImpl::StartPipeline() {
   starting_ = true;
+
   pipeline_->Start(
       filter_collection_.Pass(),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineError),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineBufferingState));
 }
 
 void WebMediaPlayerImpl::SetNetworkState(WebMediaPlayer::NetworkState state) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
@@ skipping 69 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media