Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/android/media_source_player.cc

Index: media/base/android/media_source_player.cc
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index 4551520b25f14950dad1b51d4376767869e70af7..1c117b70dfb86fe4d5938a65897c7031cbbd6370 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -18,6 +18,7 @@
 #include "media/base/android/audio_decoder_job.h"
 #include "media/base/android/media_player_manager.h"
 #include "media/base/android/video_decoder_job.h"
+#include "media/base/bind_to_current_loop.h"
 #include "media/base/timestamp_constants.h"
 
 namespace media {
@@ -258,9 +259,13 @@ void MediaSourcePlayer::OnDemuxerDurationChanged(base::TimeDelta duration) {
   duration_ = duration;
 }
 
-void MediaSourcePlayer::OnMediaCryptoReady() {
+void MediaSourcePlayer::OnMediaCryptoReady(
+    MediaDrmBridge::JavaObjectPtr /* media_crypto */,
+    bool /* needs_protected_surface */) {
+  // Callback parameters are ignored in this player. They are intended for
+  // MediaCodecPlayer which uses a different threading scheme.
   DCHECK(!drm_bridge_->GetMediaCrypto().is_null());
-  drm_bridge_->SetMediaCryptoReadyCB(base::Closure());
+  drm_bridge_->SetMediaCryptoReadyCB(MediaDrmBridge::MediaCryptoReadyCB());
 
   // Retry decoder creation if the decoders are waiting for MediaCrypto.
   RetryDecoderCreation(true, true);
@@ -292,8 +297,9 @@ void MediaSourcePlayer::SetCdm(BrowserCdm* cdm) {
   video_decoder_job_->SetDrmBridge(drm_bridge_);
 
   if (drm_bridge_->GetMediaCrypto().is_null()) {
-    drm_bridge_->SetMediaCryptoReadyCB(
+    MediaDrmBridge::MediaCryptoReadyCB cb = BindToCurrentLoop(
         base::Bind(&MediaSourcePlayer::OnMediaCryptoReady, weak_this_));
+    drm_bridge_->SetMediaCryptoReadyCB(cb);

[xhwang, 2015/09/29 23:00:30]

MSP is still running on the UI thread, right? In that case, can we skip the BTCL
here?

[Tima Vaisburd, 2015/09/29 23:17:39]

If I won't BindToCurrentLoop() the MediaDrmBridge::SetMediaCryptoReadyCB() might
directly call OnMediaCryptoReady() which in turn calls SetMediaCryptoReadyCB()
again.

[xhwang, 2015/09/29 23:29:39]

Good catch. Let's keep this BTCL to avoid the reentrance craziness.

Meanwhile I wonder whether we can just remove the callback clearing logic at
l.268. It seems MediaDrmBridge is clearing the callback when firing it already.

[Tima Vaisburd, 2015/09/29 23:43:10]

Yes, I think it can be deleted, I did this for MediaSourcePlayer. I think it's
still better to keep BCTL to avoid reentrant calls. I'd lime to go ahead and
commit this CL, I will delete l.268 in the next CL.

     return;
   }