Replace Pipeline::kEnded state and HasEnded() methods with renderer-specific bools.

media/base/pipeline.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 MEDIA_BASE_PIPELINE_H_
 #define MEDIA_BASE_PIPELINE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 60 matching lines @@
 //         | Start()                                      ^
 //         V                       SetError()             |
 //   [ InitXXX (for each filter) ] -------->[ Stopping (for each filter) ]
 //         |                                              ^
 //         V                                              | if Stop
 //   [ Seeking (for each filter) ] <--------[ Flushing (for each filter) ]
 //         |                         if Seek              ^
 //         V                                              |
 //   [ Starting (for each filter) ]                       |
 //         |                                              |
 //         V      Seek()/Stop()                           |

[Ami GONE FROM CHROMIUM, 2012/08/08 21:48:26]

why no mention of the On*Ended() callbacks?

[scherkus (not reviewing), 2012/08/08 22:28:34]

Not sure if they'd be helpful / how I could fit them in.

 //   [ Started ] -------------------------> [ Pausing (for each filter) ]
-//         |                                              ^
-//         |   OnRendererEnded()             Seek()/Stop()    |
-//         `-------------> [ Ended ] ---------------------'
 //                                                        ^  SetError()
 //                                                        |
 //                                         [ Any State Other Than InitXXX ]
 
 //
 // Initialization is a series of state transitions from "Created" through each
 // filter initialization state.  When all filter initialization states have
 // completed, we are implicitly in a "Paused" state.  At that point we simulate
 // a Seek() to the beginning of the media to give filters a chance to preroll.
 // From then on the normal Seek() transitions are carried out and we start
@@ skipping 143 matching lines @@
     kInitDemuxer,
     kInitAudioDecoder,
     kInitAudioRenderer,
     kInitVideoDecoder,
     kInitVideoRenderer,
     kPausing,
     kSeeking,
     kFlushing,
     kStarting,
     kStarted,
-    kEnded,
     kStopping,
     kStopped,
     kError,
   };
 
   // Updates |state_|. All state transitions should use this call.
   void SetState(State next_state);
 
   // Simple method used to make sure the pipeline is running normally.
   bool IsPipelineOk();
@@ skipping 34 matching lines @@
   virtual void OnDemuxerError(PipelineStatus error) OVERRIDE;
 
   // Initiates teardown sequence in response to a runtime error.
   //
   // Safe to call from any thread.
   void SetError(PipelineStatus error);
 
   // Callback executed when the natural size of the video has changed.
   void OnNaturalVideoSizeChanged(const gfx::Size& size);
 
-  // Callback executed when either of the renderers have ended.
-  void OnRendererEnded();
+  // Callbacks executed when a renderer has ended.
+  void OnAudioRendererEnded();
+  void OnVideoRendererEnded();
 
   // Callbacks executed by filters upon completing initialization.
   void OnFilterInitialize(PipelineStatus status);
 
   // Callback executed by filters upon completing Play(), Pause(), Flush(),
   // Seek() or Stop().
   void OnFilterStateTransition(PipelineStatus status);
 
   // Callback executed by filters when completing teardown operations.
   void OnTeardownStateTransition(PipelineStatus status);
@@ skipping 34 matching lines @@
 
   // Carries out notifying filters that the playback rate has changed.
   void PlaybackRateChangedTask(float playback_rate);
 
   // Carries out notifying filters that the volume has changed.
   void VolumeChangedTask(float volume);
 
   // Carries out notifying filters that we are seeking to a new timestamp.
   void SeekTask(base::TimeDelta time, const PipelineStatusCB& seek_cb);
 
-  // Carries out handling a notification from a renderer that it has ended.
-  void OnRendererEndedTask();
+  // Handles audio/video ended logic and running |ended_cb_|.
+  void DoAudioRendererEnded();
+  void DoVideoRendererEnded();
+  void RunEndedCallbackIfNeeded();
 
   // Carries out disabling the audio renderer.
   void AudioDisabledTask();
 
   // Carries out advancing to the next filter during Play()/Pause()/Seek().
   void FilterStateTransitionTask();
 
   // Carries out advancing to the next teardown operation.
   void TeardownStateTransitionTask();
 
@@ skipping 140 matching lines @@
   // The following data members are only accessed by tasks posted to
   // |message_loop_|.
 
   // Member that tracks the current state.
   State state_;
 
   // For kSeeking we need to remember where we're seeking between filter
   // replies.
   base::TimeDelta seek_timestamp_;
 
+  // Whether we've received the audio/video ended events.
+  bool audio_ended_;
+  bool video_ended_;
+
   // Set to true in DisableAudioRendererTask().
   bool audio_disabled_;
 
   // Filter collection as passed in by Start().
   scoped_ptr<FilterCollection> filter_collection_;
 
   // Callbacks for various pipeline operations.
   PipelineStatusCB seek_cb_;
   base::Closure stop_cb_;
   PipelineStatusCB ended_cb_;
@@ skipping 27 matching lines @@
   base::Time creation_time_;
 
   scoped_ptr<SerialRunner> pending_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(Pipeline);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_H_