Throttle media decoding after excessive Android media server crashes

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 4ed14aa478a9fd20013d99a9bf5b23de398a8916..82382e2787c6ae836bf578ff5b4fce2193c00e02 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -25,12 +25,12 @@ namespace media {
 MediaSourcePlayer::MediaSourcePlayer(
     int player_id,
     MediaPlayerManager* manager,
-    const RequestMediaResourcesCB& request_media_resources_cb,
+    const OnPlayerReleasedCB& on_player_released_cb,
     scoped_ptr<DemuxerAndroid> demuxer,
     const GURL& frame_url)
     : MediaPlayerAndroid(player_id,
                          manager,
-                         request_media_resources_cb,
+                         on_player_released_cb,
                          frame_url),
       demuxer_(demuxer.Pass()),
       pending_event_(NO_EVENT_PENDING),
@@ -56,7 +56,6 @@ MediaSourcePlayer::MediaSourcePlayer(
       base::Bind(&DemuxerAndroid::RequestDemuxerData,
                  base::Unretained(demuxer_.get()),
                  DemuxerStream::VIDEO),
-      base::Bind(request_media_resources_cb_, player_id),
       base::Bind(&MediaSourcePlayer::OnDemuxerConfigsChanged,
                  weak_factory_.GetWeakPtr())));
   demuxer_->Initialize(this);
@@ -187,6 +186,7 @@ void MediaSourcePlayer::Release() {
   decoder_starvation_callback_.Cancel();
 
   DetachListener();
+  on_player_released_cb_.Run(player_id());
 }
 
 void MediaSourcePlayer::SetVolume(double volume) {
@@ -206,7 +206,7 @@ bool MediaSourcePlayer::CanSeekBackward() {
 }
 
 bool MediaSourcePlayer::IsPlayerReady() {
-  return audio_decoder_job_ || video_decoder_job_;
+  return HasAudio() || HasVideo();
 }
 
 void MediaSourcePlayer::StartInternal() {