| Index: media/base/pipeline.h
|
| diff --git a/media/base/pipeline.h b/media/base/pipeline.h
|
| index 1464cc2485952d766b3520000910dfd59071ff9c..5fdd7d10060412739b3936edfdb456f6e2a9d7e7 100644
|
| --- a/media/base/pipeline.h
|
| +++ b/media/base/pipeline.h
|
| @@ -309,8 +309,6 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost {
|
| void DoStop(const PipelineStatusCB& done_cb);
|
| void OnStopCompleted(PipelineStatus status);
|
|
|
| - void OnAudioUnderflow();
|
| -
|
| // Collection of callback methods and helpers for tracking changes in
|
| // buffering state and transition from paused/underflow states and playing
|
| // states.
|
| @@ -319,11 +317,13 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost {
|
| // - A waiting to non-waiting transition indicates preroll has completed
|
| // and StartPlayback() should be called
|
| // - A non-waiting to waiting transition indicates underflow has occurred
|
| - // and StartWaitingForEnoughData() should be called
|
| + // and PausePlayback() should be called
|
| void BufferingStateChanged(BufferingState* buffering_state,
|
| BufferingState new_buffering_state);
|
| bool WaitingForEnoughData() const;
|
| - void StartWaitingForEnoughData();
|
| + void TransitionToWaiting();
|
| + void TransitionToNonWaiting();
|
| + void PausePlayback();
|
| void StartPlayback();
|
|
|
| void StartClockIfWaitingForTimeUpdate_Locked();
|
|
|