Commit fb596157 authored by alokp's avatar alokp Committed by Commit bot

Make default media::Renderer::playback_rate = 0.

BUG=616959

Review-Url: https://codereview.chromium.org/2305113002
Cr-Commit-Position: refs/heads/master@{#416997}
parent 9bcbbd3b
...@@ -136,6 +136,7 @@ class PipelineHelper { ...@@ -136,6 +136,7 @@ class PipelineHelper {
eos_[STREAM_VIDEO] = !media_pipeline_.HasVideo(); eos_[STREAM_VIDEO] = !media_pipeline_.HasVideo();
base::TimeDelta start_time = base::TimeDelta::FromMilliseconds(0); base::TimeDelta start_time = base::TimeDelta::FromMilliseconds(0);
media_pipeline_.StartPlayingFrom(start_time); media_pipeline_.StartPlayingFrom(start_time);
media_pipeline_.SetPlaybackRate(1.0);
} }
void SetCdm() { media_pipeline_.SetCdm(cdm_context_.get()); } void SetCdm() { media_pipeline_.SetCdm(cdm_context_.get()); }
void Flush(const base::Closure& flush_cb) { media_pipeline_.Flush(flush_cb); } void Flush(const base::Closure& flush_cb) { media_pipeline_.Flush(flush_cb); }
......
...@@ -83,7 +83,7 @@ struct MediaPipelineImpl::FlushTask { ...@@ -83,7 +83,7 @@ struct MediaPipelineImpl::FlushTask {
MediaPipelineImpl::MediaPipelineImpl() MediaPipelineImpl::MediaPipelineImpl()
: cdm_context_(nullptr), : cdm_context_(nullptr),
backend_state_(BACKEND_STATE_UNINITIALIZED), backend_state_(BACKEND_STATE_UNINITIALIZED),
playback_rate_(1.0f), playback_rate_(0),
audio_decoder_(nullptr), audio_decoder_(nullptr),
video_decoder_(nullptr), video_decoder_(nullptr),
pending_time_update_task_(false), pending_time_update_task_(false),
......
...@@ -71,6 +71,7 @@ MediaSourcePlayer::MediaSourcePlayer( ...@@ -71,6 +71,7 @@ MediaSourcePlayer::MediaSourcePlayer(
weak_factory_.GetWeakPtr()))); weak_factory_.GetWeakPtr())));
demuxer_->Initialize(this); demuxer_->Initialize(this);
interpolator_.SetPlaybackRate(1.0);
interpolator_.SetUpperBound(base::TimeDelta()); interpolator_.SetUpperBound(base::TimeDelta());
weak_this_ = weak_factory_.GetWeakPtr(); weak_this_ = weak_factory_.GetWeakPtr();
} }
......
...@@ -49,7 +49,7 @@ class MEDIA_EXPORT Renderer { ...@@ -49,7 +49,7 @@ class MEDIA_EXPORT Renderer {
// Starts rendering from |time|. // Starts rendering from |time|.
virtual void StartPlayingFrom(base::TimeDelta time) = 0; virtual void StartPlayingFrom(base::TimeDelta time) = 0;
// Updates the current playback rate. The default playback rate should be 1. // Updates the current playback rate. The default playback rate should be 0.
virtual void SetPlaybackRate(double playback_rate) = 0; virtual void SetPlaybackRate(double playback_rate) = 0;
// Sets the output volume. The default volume should be 1. // Sets the output volume. The default volume should be 1.
......
...@@ -18,7 +18,7 @@ TimeDeltaInterpolator::TimeDeltaInterpolator(base::TickClock* tick_clock) ...@@ -18,7 +18,7 @@ TimeDeltaInterpolator::TimeDeltaInterpolator(base::TickClock* tick_clock)
: tick_clock_(tick_clock), : tick_clock_(tick_clock),
interpolating_(false), interpolating_(false),
upper_bound_(kNoTimestamp), upper_bound_(kNoTimestamp),
playback_rate_(1.0) { playback_rate_(0) {
DCHECK(tick_clock_); DCHECK(tick_clock_);
} }
......
...@@ -40,6 +40,7 @@ class MEDIA_EXPORT TimeDeltaInterpolator { ...@@ -40,6 +40,7 @@ class MEDIA_EXPORT TimeDeltaInterpolator {
base::TimeDelta StopInterpolating(); base::TimeDelta StopInterpolating();
// Sets a new rate at which to interpolate. // Sets a new rate at which to interpolate.
// The default rate is 0.
// //
// |tick_clock| will be queried for a new reference time value. // |tick_clock| will be queried for a new reference time value.
void SetPlaybackRate(double playback_rate); void SetPlaybackRate(double playback_rate);
......
...@@ -11,7 +11,9 @@ namespace media { ...@@ -11,7 +11,9 @@ namespace media {
class TimeDeltaInterpolatorTest : public ::testing::Test { class TimeDeltaInterpolatorTest : public ::testing::Test {
public: public:
TimeDeltaInterpolatorTest() : interpolator_(&test_tick_clock_) {} TimeDeltaInterpolatorTest() : interpolator_(&test_tick_clock_) {
interpolator_.SetPlaybackRate(1.0);
}
protected: protected:
void AdvanceSystemTime(base::TimeDelta delta) { void AdvanceSystemTime(base::TimeDelta delta) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment