Add the SetMediaKeys handler to pass a drm bridge to a MediaSourcePlayer

media/base/android/media_source_player.cc

 // Copyright (c) 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/base/android/media_source_player.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 268 matching lines @@
       sampling_rate_(0),
       audio_finished_(true),
       video_finished_(true),
       playing_(false),
       reconfig_audio_decoder_(false),
       reconfig_video_decoder_(false),
       audio_access_unit_index_(0),
       video_access_unit_index_(0),
       waiting_for_audio_data_(false),
       waiting_for_video_data_(false),
-      weak_this_(this) {
+      weak_this_(this),
+      drm_bridge_(NULL) {
 }
 
 MediaSourcePlayer::~MediaSourcePlayer() {
   Release();
 }
 
 void MediaSourcePlayer::SetVideoSurface(gfx::ScopedJavaSurface surface) {
   surface_ =  surface.Pass();
   pending_event_ |= SURFACE_CHANGE_EVENT_PENDING;
   if (pending_event_ & SEEK_EVENT_PENDING) {
@@ skipping 164 matching lines @@
     received_video_ = params;
     if (!pending_event_)
       DecodeMoreVideo();
   }
 }
 
 void MediaSourcePlayer::DurationChanged(const base::TimeDelta& duration) {
   duration_ = duration;
 }
 
+void MediaSourcePlayer::SetDrmBridge(MediaDrmBridge* drm_bridge) {
+  drm_bridge_ = drm_bridge;
+  // TODO(qinmin): similar to SetVideoSurface() call, we need to wait for the
+  // current decoder jobs to finish, and then use the ProcessPendingEvents()
+  // to pass the drm_bridge to the decoder jobs.

[xhwang, 2013/06/21 20:45:11]

I am not sure if we could/should do here. So this TODO seems a bit premature to
me.

[qinmin, 2013/06/21 20:53:17]

This is just to handle a DRM change in the middle of decoding. We can just set a
flag here, something like PENDING_DRM_CHANGE.
And then when both decoders finish decoding the current frame, we pass the drm
object to it so it can recreate the codecs.

If we don't allow DRM change during decoding, then this call will just do the
assignment above statement. But we still have to deal with the situation that
DRM object is teared down before the player.

On 2013/06/21 20:45:11, xhwang wrote:

+}
+
 void MediaSourcePlayer::OnSeekRequestAck(unsigned seek_request_id) {
   // Do nothing until the most recent seek request is processed.
   if (seek_request_id_ != seek_request_id)
     return;
   pending_event_ &= ~SEEK_EVENT_PENDING;
   OnSeekComplete();
   ProcessPendingEvents();
 }
 
 void MediaSourcePlayer::UpdateTimestamps(
@@ skipping 206 matching lines @@
       reconfig_video_decoder_ = false;
   }
 
   // Inform the fullscreen view the player is ready.
   // TODO(qinmin): refactor MediaPlayerBridge so that we have a better way
   // to inform ContentVideoView.
   OnMediaMetadataChanged(duration_, width_, height_, true);
 }
 
 }  // namespace media