Enable seek in fullscreen mode for MSE impl on android

webkit/media/android/webmediaplayer_android.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/android/webmediaplayer_android.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 137 matching lines @@
 }
 
 void WebMediaPlayerAndroid::pause() {
   if (proxy_)
     proxy_->Pause(player_id_);
   is_playing_ = false;
 }
 
 void WebMediaPlayerAndroid::seek(double seconds) {
   pending_seek_ = seconds;
+  if (seeking_ && media_source_delegate_)
+    media_source_delegate_->CancelPendingSeek();
   seeking_ = true;
 
   base::TimeDelta seek_time = ConvertSecondsToTimestamp(seconds);
+#if defined(GOOGLE_TV)
+  // TODO(qinmin): check if GTV can also defer the seek until the browser side
+  // player is ready.
   if (media_source_delegate_)
     media_source_delegate_->Seek(seek_time);
+#endif
   if (proxy_)
     proxy_->Seek(player_id_, seek_time);
 }
 
 bool WebMediaPlayerAndroid::supportsFullscreen() const {
   return true;
 }
 
 bool WebMediaPlayerAndroid::supportsSave() const {
   return false;
@@ skipping 319 matching lines @@
 void WebMediaPlayerAndroid::OnMediaPlayerPlay() {
   UpdatePlayingState(true);
   client_->playbackStateChanged();
 }
 
 void WebMediaPlayerAndroid::OnMediaPlayerPause() {
   UpdatePlayingState(false);
   client_->playbackStateChanged();
 }
 
+void WebMediaPlayerAndroid::OnMediaSeekRequest(base::TimeDelta time_to_seek,
+                                               bool request_texture_peer) {
+  if (!media_source_delegate_)
+    return;
+
+  if (seeking_)
+    media_source_delegate_->CancelPendingSeek();

[acolwell GONE FROM CHROMIUM, 2013/05/23 20:58:27]

It's not clear to me why this is needed. It seems like it should be !seeking_
above since in the single seek case I'm pretty sure seeking_ is always true
here.

[qinmin, 2013/05/23 22:03:36]

changed the if statement to (!seeking_). If the seek is requested in fullscreen
mode, seeking_ will be false here.

On 2013/05/23 20:58:27, acolwell wrote:

+  seeking_ = true;
+  media_source_delegate_->Seek(time_to_seek);
+  OnTimeUpdate(time_to_seek);
+  if (request_texture_peer)
+    EstablishSurfaceTexturePeer();
+}
+
 void WebMediaPlayerAndroid::UpdateNetworkState(
     WebMediaPlayer::NetworkState state) {
   network_state_ = state;
   client_->networkStateChanged();
 }
 
 void WebMediaPlayerAndroid::UpdateReadyState(
     WebMediaPlayer::ReadyState state) {
   ready_state_ = state;
   client_->readyStateChanged();
@@ skipping 178 matching lines @@
 void WebMediaPlayerAndroid::exitFullscreen() {
   if (proxy_)
     proxy_->ExitFullscreen(player_id_);
 }
 
 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
   return manager_->CanEnterFullscreen(frame_);
 }
 
 }  // namespace webkit_media