Allow transitioning to HAVE_METADATA before pipeline initialization completes.

webkit/media/webmediaplayer_proxy.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 
 #include <list>
 #include <string>
 #include <vector>
@@ skipping 57 matching lines @@
   void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect, uint8_t alpha);
   void Detach();
   void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out);
   void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame);
   bool HasSingleOrigin();
   bool DidPassCORSAccessCheck() const;
 
   void AbortDataSource();
 
   // Methods for Pipeline -> WebMediaPlayerImpl communication.
-  void PipelineInitializationCallback(media::PipelineStatus status);
   void PipelineSeekCallback(media::PipelineStatus status);
   void PipelineEndedCallback(media::PipelineStatus status);
   void PipelineErrorCallback(media::PipelineStatus error);
+  void 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.

 
   // ChunkDemuxerClient implementation.
   virtual void DemuxerOpened(media::ChunkDemuxer* demuxer) OVERRIDE;
   virtual void DemuxerClosed() OVERRIDE;
   virtual void DemuxerNeedKey(scoped_array<uint8> init_data,
                               int init_data_size) OVERRIDE;
 
   // Methods for Demuxer communication.
   void DemuxerStartWaitingForSeek();
   void DemuxerCancelPendingSeek();
@@ skipping 25 matching lines @@
                        scoped_array<uint8> init_data,
                        int init_data_size) OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<WebMediaPlayerProxy>;
   virtual ~WebMediaPlayerProxy();
 
   // Invoke |webmediaplayer_| to perform a repaint.
   void RepaintTask();
 
-  // Notify |webmediaplayer_| that initialization has finished.
-  void PipelineInitializationTask(media::PipelineStatus status);
-
   // Notify |webmediaplayer_| that a seek has finished.
   void PipelineSeekTask(media::PipelineStatus status);
 
   // Notify |webmediaplayer_| that the media has ended.
   void PipelineEndedTask(media::PipelineStatus status);
 
   // Notify |webmediaplayer_| that a pipeline error has occurred during
   // playback.
   void PipelineErrorTask(media::PipelineStatus error);
 
+  // Notify |webmediaplayer_| of readyState changes.

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

unix_hacker

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

Done.

+  void 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.

+
   // Inform |webmediaplayer_| whether the video content is opaque.
   void SetOpaqueTask(bool opaque);
 
   void DemuxerOpenedTask(const scoped_refptr<media::ChunkDemuxer>& demuxer);
   void DemuxerClosedTask();
 
   // Notify |webmediaplayer_| that a key has been added.
   void KeyAddedTask(const std::string& key_system,
                     const std::string& session_id);
 
@@ skipping 28 matching lines @@
   int outstanding_repaints_;
 
   scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_