PipelineError is dead. Long live PipelineStatus!

webkit/glue/webmediaplayer_impl.h

 // Copyright (c) 2011 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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains PipelineImpl which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // PipelineImpl would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 93 matching lines @@
     // Methods for WebMediaPlayerImpl -> Filter communication.
     void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& dest_rect);
     void SetSize(const gfx::Rect& rect);
     void Detach();
     void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out);
     void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame);
     bool HasSingleOrigin();
     void AbortDataSources();
 
     // Methods for PipelineImpl -> WebMediaPlayerImpl communication.
-    void PipelineInitializationCallback();
-    void PipelineSeekCallback();
-    void PipelineEndedCallback();
-    void PipelineErrorCallback();
-    void NetworkEventCallback();
+    void PipelineInitializationCallback(media::PipelineStatus status);
+    void PipelineSeekCallback(media::PipelineStatus status);
+    void PipelineEndedCallback(media::PipelineStatus status);
+    void PipelineStatusCallback(media::PipelineStatus status);

[acolwell GONE FROM CHROMIUM, 2011/03/15 03:56:28]

I think this should stay PipelineErrorCallback() since it is only called to
indicate when an error has occurred during playback.

[Ami GONE FROM CHROMIUM, 2011/03/15 17:37:18]

Done.

+    void NetworkEventCallback(media::PipelineStatus status);
 
     // Returns the message loop used by the proxy.
     MessageLoop* message_loop() { return render_loop_; }
 
    private:
     friend class base::RefCountedThreadSafe<Proxy>;
 
     virtual ~Proxy();
 
     // Adds a data source to data_sources_.
     void AddDataSource(WebDataSource* data_source);
 
     // Invoke |webmediaplayer_| to perform a repaint.
     void RepaintTask();
 
     // Notify |webmediaplayer_| that initialization has finished.
-    void PipelineInitializationTask();
+    void PipelineInitializationTask(media::PipelineStatus status);
 
     // Notify |webmediaplayer_| that a seek has finished.
-    void PipelineSeekTask();
+    void PipelineSeekTask(media::PipelineStatus status);
 
     // Notify |webmediaplayer_| that the media has ended.
-    void PipelineEndedTask();
+    void PipelineEndedTask(media::PipelineStatus status);
 
     // Notify |webmediaplayer_| that a pipeline error has been set.

[acolwell GONE FROM CHROMIUM, 2011/03/15 03:56:28]

Maybe change to something like, "Notify |webmediaplayer_| when a pipeline error
has occurred during playback?"

[Ami GONE FROM CHROMIUM, 2011/03/15 17:37:18]

Done.

-    void PipelineErrorTask();
+    void PipelineStatusTask(media::PipelineStatus status);

[acolwell GONE FROM CHROMIUM, 2011/03/15 03:56:28]

PipelineErrorTask() since it is only called on an error condition?

[Ami GONE FROM CHROMIUM, 2011/03/15 17:37:18]

Done.

 
     // Notify |webmediaplayer_| that there's a network event.
-    void NetworkEventTask();
+    void NetworkEventTask(media::PipelineStatus status);
 
     // The render message loop where WebKit lives.
     MessageLoop* render_loop_;
     WebMediaPlayerImpl* webmediaplayer_;
 
     base::Lock data_sources_lock_;
     typedef std::list<scoped_refptr<WebDataSource> > DataSourceList;
     DataSourceList data_sources_;
     scoped_ptr<WebDataSourceBuildObserverHack> build_observer_;
 
@@ skipping 96 matching lines @@
   virtual void putCurrentFrame(WebKit::WebVideoFrame* web_video_frame);
 
   // As we are closing the tab or even the browser, |main_loop_| is destroyed
   // even before this object gets destructed, so we need to know when
   // |main_loop_| is being destroyed and we can stop posting repaint task
   // to it.
   virtual void WillDestroyCurrentMessageLoop();
 
   void Repaint();
 
-  void OnPipelineInitialize();
+  void OnPipelineInitialize(media::PipelineStatus status);
 
-  void OnPipelineSeek();
+  void OnPipelineSeek(media::PipelineStatus status);
 
-  void OnPipelineEnded();
+  void OnPipelineEnded(media::PipelineStatus status);
 
-  void OnPipelineError();
+  void OnPipelineStatus(media::PipelineStatus status);

[acolwell GONE FROM CHROMIUM, 2011/03/15 03:56:28]

Same comment as above.

[Ami GONE FROM CHROMIUM, 2011/03/15 17:37:18]

Done, but note that the impl used to treat PIPELINE_OK as a network error (!). 
PTAL at the impl change.

 
-  void OnNetworkEvent();
+  void OnNetworkEvent(media::PipelineStatus status);
 
  private:
   // Helpers that set the network/ready state and notifies the client if
   // they've changed.
   void SetNetworkState(WebKit::WebMediaPlayer::NetworkState state);
   void SetReadyState(WebKit::WebMediaPlayer::ReadyState state);
 
   // Destroy resources held.
   void Destroy();
 
   // Callback executed after |pipeline_| stops which signals Destroy()
   // to continue.
-  void PipelineStoppedCallback();
+  void PipelineStoppedCallback(media::PipelineStatus status);
 
   // Getter method to |client_|.
   WebKit::WebMediaPlayerClient* GetClient();
 
   // TODO(hclam): get rid of these members and read from the pipeline directly.
   WebKit::WebMediaPlayer::NetworkState network_state_;
   WebKit::WebMediaPlayer::ReadyState ready_state_;
 
   // Keep a list of buffered time ranges.
   WebKit::WebTimeRanges buffered_;
@@ skipping 37 matching lines @@
 #if WEBKIT_USING_CG
   scoped_ptr<skia::PlatformCanvas> skia_canvas_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_