Use cached Key frames to avoid browser seek

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 <limits>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 546 matching lines @@
   if (is_audio)
     return !HasAudio() || !audio_decoder_job_->prerolling();
   return !HasVideo() || !video_decoder_job_->prerolling();
 }
 
 void MediaSourcePlayer::DecodeMoreAudio() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(!audio_decoder_job_->is_decoding());
   DCHECK(!AudioFinished());
 
-  if (audio_decoder_job_->Decode(
+  MediaDecoderJob::MediaDecoderJobStatus status = audio_decoder_job_->Decode(
       start_time_ticks_,
       start_presentation_timestamp_,
-      base::Bind(&MediaSourcePlayer::MediaDecoderCallback, weak_this_, true))) {
-    TRACE_EVENT_ASYNC_BEGIN0("media", "MediaSourcePlayer::DecodeMoreAudio",
-                             audio_decoder_job_.get());
-    return;
+      base::Bind(&MediaSourcePlayer::MediaDecoderCallback, weak_this_, true));
+
+  switch (status) {
+    case MediaDecoderJob::STATUS_SUCCESS:
+      TRACE_EVENT_ASYNC_BEGIN0("media", "MediaSourcePlayer::DecodeMoreAudio",
+                               audio_decoder_job_.get());
+      break;
+    case MediaDecoderJob::STATUS_KEY_FRAME_REQUIRED:
+      NOTREACHED();
+      break;
+    case MediaDecoderJob::STATUS_FAILURE:
+      is_waiting_for_audio_decoder_ = true;
+      if (!IsEventPending(DECODER_CREATION_EVENT_PENDING))
+        SetPendingEvent(DECODER_CREATION_EVENT_PENDING);
+      break;
   }
-
-  is_waiting_for_audio_decoder_ = true;
-  if (!IsEventPending(DECODER_CREATION_EVENT_PENDING))
-    SetPendingEvent(DECODER_CREATION_EVENT_PENDING);
 }
 
 void MediaSourcePlayer::DecodeMoreVideo() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(!video_decoder_job_->is_decoding());
   DCHECK(!VideoFinished());
 
-  if (video_decoder_job_->Decode(
+  MediaDecoderJob::MediaDecoderJobStatus status = video_decoder_job_->Decode(
       start_time_ticks_,
       start_presentation_timestamp_,
       base::Bind(&MediaSourcePlayer::MediaDecoderCallback, weak_this_,
-                 false))) {
-    TRACE_EVENT_ASYNC_BEGIN0("media", "MediaSourcePlayer::DecodeMoreVideo",
-                             video_decoder_job_.get());
-    return;
+                 false));
+
+  switch (status) {
+    case MediaDecoderJob::STATUS_SUCCESS:
+      TRACE_EVENT_ASYNC_BEGIN0("media", "MediaSourcePlayer::DecodeMoreVideo",
+                               video_decoder_job_.get());
+      break;
+    case MediaDecoderJob::STATUS_KEY_FRAME_REQUIRED:
+      BrowserSeekToCurrentTime();
+      break;
+    case MediaDecoderJob::STATUS_FAILURE:
+      is_waiting_for_video_decoder_ = true;
+      if (!IsEventPending(DECODER_CREATION_EVENT_PENDING))
+        SetPendingEvent(DECODER_CREATION_EVENT_PENDING);
+      break;
   }
-
-  // If the decoder is waiting for iframe, trigger a browser seek.
-  if (!video_decoder_job_->next_video_data_is_iframe()) {
-    BrowserSeekToCurrentTime();
-    return;
-  }
-
-  is_waiting_for_video_decoder_ = true;
-  if (!IsEventPending(DECODER_CREATION_EVENT_PENDING))
-    SetPendingEvent(DECODER_CREATION_EVENT_PENDING);
 }
 
 void MediaSourcePlayer::PlaybackCompleted(bool is_audio) {
   DVLOG(1) << __FUNCTION__ << "(" << is_audio << ")";
 
   if (AudioFinished() && VideoFinished()) {
     playing_ = false;
     start_time_ticks_ = base::TimeTicks();
     manager()->OnPlaybackComplete(player_id());
   }
@@ skipping 192 matching lines @@
   // support setMediaKeys(0) (see http://crbug.com/330324), or when we release
   // MediaDrm when the video is paused, or when the device goes to sleep (see
   // http://crbug.com/272421).
   audio_decoder_job_->SetDrmBridge(NULL);
   video_decoder_job_->SetDrmBridge(NULL);
   cdm_registration_id_ = 0;
   drm_bridge_ = NULL;
 }
 
 }  // namespace media