Allow transitioning to HAVE_METADATA before pipeline initialization completes.

webkit/media/webmediaplayer_proxy.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_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/pipeline_status.h"
@@ skipping 71 matching lines @@
     data_source_->Abort();
 }
 
 void WebMediaPlayerProxy::Detach() {
   DCHECK(render_loop_->BelongsToCurrentThread());
   webmediaplayer_ = NULL;
   data_source_ = NULL;
   frame_provider_ = NULL;
 }
 
-void WebMediaPlayerProxy::PipelineInitializationCallback(
-    PipelineStatus status) {
-  render_loop_->PostTask(FROM_HERE, base::Bind(
-      &WebMediaPlayerProxy::PipelineInitializationTask, this, status));
-}
-
 void WebMediaPlayerProxy::PipelineSeekCallback(PipelineStatus status) {
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::PipelineSeekTask, this, status));
 }
 
 void WebMediaPlayerProxy::PipelineEndedCallback(PipelineStatus status) {
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::PipelineEndedTask, this, status));
 }
 
 void WebMediaPlayerProxy::PipelineErrorCallback(PipelineStatus error) {
   DCHECK_NE(error, media::PIPELINE_OK);
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::PipelineErrorTask, this, error));
 }
 
+void WebMediaPlayerProxy::PipelineReadyStateCallback(
+    media::Pipeline::ReadyState readyState) {

[scherkus (not reviewing), 2012/08/15 23:43:16]

unix_hacker

[acolwell GONE FROM CHROMIUM, 2012/08/16 00:54:18]

Done.

+  render_loop_->PostTask(FROM_HERE, base::Bind(
+      &WebMediaPlayerProxy::PipelineReadyStateTask, this, readyState));
+}
+
 void WebMediaPlayerProxy::RepaintTask() {
   DCHECK(render_loop_->BelongsToCurrentThread());
   {
     base::AutoLock auto_lock(lock_);
     --outstanding_repaints_;
     DCHECK_GE(outstanding_repaints_, 0);
   }
   if (webmediaplayer_) {
     webmediaplayer_->Repaint();
   }
 }
 
-void WebMediaPlayerProxy::PipelineInitializationTask(PipelineStatus status) {
-  DCHECK(render_loop_->BelongsToCurrentThread());
-  if (webmediaplayer_)
-    webmediaplayer_->OnPipelineInitialize(status);
-}
-
 void WebMediaPlayerProxy::PipelineSeekTask(PipelineStatus status) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->OnPipelineSeek(status);
 }
 
 void WebMediaPlayerProxy::PipelineEndedTask(PipelineStatus status) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->OnPipelineEnded(status);
 }
 
 void WebMediaPlayerProxy::PipelineErrorTask(PipelineStatus error) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->OnPipelineError(error);
 }
 
+void WebMediaPlayerProxy::PipelineReadyStateTask(
+    media::Pipeline::ReadyState readyState) {

[scherkus (not reviewing), 2012/08/15 23:43:16]

unix_hacker

[acolwell GONE FROM CHROMIUM, 2012/08/16 00:54:18]

Done.

+  DCHECK(render_loop_->BelongsToCurrentThread());
+  if (webmediaplayer_)
+    webmediaplayer_->OnPipelineReadyState(readyState);
+}
+
 void WebMediaPlayerProxy::SetOpaqueTask(bool opaque) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->SetOpaque(opaque);
 }
 
 void WebMediaPlayerProxy::GetCurrentFrame(
     scoped_refptr<media::VideoFrame>* frame_out) {
   if (frame_provider_)
     frame_provider_->GetCurrentFrame(frame_out);
@@ skipping 151 matching lines @@
                                       const std::string& session_id,
                                       scoped_array<uint8> init_data,
                                       int init_data_size) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->OnNeedKey(key_system, session_id,
                                init_data.Pass(), init_data_size);
 }
 
 }  // namespace webkit_media