Fix media stream playback event as media element.

webkit/media/webmediaplayer_ms.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/webmediaplayer_ms.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 27 matching lines @@
     base::WeakPtr<WebMediaPlayerDelegate> delegate,
     MediaStreamClient* media_stream_client,
     media::MediaLog* media_log)
     : frame_(frame),
       network_state_(WebMediaPlayer::NetworkStateEmpty),
       ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
       buffered_(static_cast<size_t>(1)),
       client_(client),
       delegate_(delegate),
       media_stream_client_(media_stream_client),
-      video_frame_provider_started_(false),
       paused_(true),
       pending_repaint_(false),
-      got_first_frame_(false),
+      received_first_frame_(false),
+      sequence_started_(false),
       total_frame_count_(0),
       dropped_frame_count_(0),
       media_log_(media_log) {
   DVLOG(1) << "WebMediaPlayerMS::ctor";
   DCHECK(media_stream_client);
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 }
 
 WebMediaPlayerMS::~WebMediaPlayerMS() {
@@ skipping 23 matching lines @@
 
   // Check if this url is media stream.
   video_frame_provider_ = media_stream_client_->GetVideoFrameProvider(
       url,
       base::Bind(&WebMediaPlayerMS::OnSourceError, AsWeakPtr()),
       base::Bind(&WebMediaPlayerMS::OnFrameAvailable, AsWeakPtr()));
   if (video_frame_provider_) {
     SetNetworkState(WebMediaPlayer::NetworkStateLoaded);
     GetClient()->sourceOpened();
     GetClient()->setOpaque(true);
-    SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
-    SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
-    RepaintInternal();
+    video_frame_provider_->Start();
   } else {
     SetNetworkState(WebMediaPlayer::NetworkStateNetworkError);
   }
 }
 
 void WebMediaPlayerMS::cancelLoad() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void WebMediaPlayerMS::play() {
   DVLOG(1) << "WebMediaPlayerMS::play";
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  if (video_frame_provider_ && paused_) {
+    video_frame_provider_->Play();
+  }
   paused_ = false;
-  if (video_frame_provider_) {
-    if (video_frame_provider_started_) {
-      video_frame_provider_->Play();
-    } else {
-      video_frame_provider_started_ = true;
-      video_frame_provider_->Start();
-    }
-  }
+
   // TODO(wjia): add audio. See crbug.com/142988.
 
   media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::PLAY));
 
   if (delegate_)
     delegate_->DidPlay(this);
 }
 
 void WebMediaPlayerMS::pause() {
   DVLOG(1) << "WebMediaPlayerMS::pause";
@@ skipping 209 matching lines @@
   if (web_video_frame) {
     delete web_video_frame;
   }
 }
 
 void WebMediaPlayerMS::OnFrameAvailable(
     const scoped_refptr<media::VideoFrame>& frame) {
   DVLOG(3) << "WebMediaPlayerMS::OnFrameAvailable";
   DCHECK(thread_checker_.CalledOnValidThread());
   ++total_frame_count_;
-  if (!got_first_frame_) {
-    got_first_frame_ = true;
+  if (!received_first_frame_) {
+    received_first_frame_ = true;
+    current_frame_ = media::VideoFrame::CreateBlackFrame(frame->natural_size());
+    SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
+    SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
+    GetClient()->sizeChanged();
+  }
+
+  // Do not update |current_frame_| when paused.
+  if (paused_)
+    return;
+
+  if (!sequence_started_) {
+    sequence_started_ = true;
     start_time_ = frame->GetTimestamp();

[scherkus (not reviewing), 2012/10/22 17:40:05]

when we play, then pause, then play again won't time jump forward?

is that expected or will the frame provider adjust timestamps as necessary when
pausing/playing?

   }
   bool size_changed = !current_frame_ ||
       current_frame_->natural_size() != frame->natural_size();
 
   current_frame_ = frame;
   current_frame_->SetTimestamp(frame->GetTimestamp() - start_time_);
 
   if (size_changed)
     GetClient()->sizeChanged();
 
@@ skipping 35 matching lines @@
   GetClient()->readyStateChanged();
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_media