| Index: media/base/pipeline.cc
|
| diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
|
| index e4c865f93dd6c27f2efe3882402c69510c55f8e7..66592faf431a60f322b0d0869ece1a3a6e85a3f9 100644
|
| --- a/media/base/pipeline.cc
|
| +++ b/media/base/pipeline.cc
|
| @@ -189,20 +189,6 @@ void Pipeline::SetVolume(float volume) {
|
| }
|
| }
|
|
|
| -Preload Pipeline::GetPreload() const {
|
| - base::AutoLock auto_lock(lock_);
|
| - return preload_;
|
| -}
|
| -
|
| -void Pipeline::SetPreload(Preload preload) {
|
| - base::AutoLock auto_lock(lock_);
|
| - preload_ = preload;
|
| - if (running_ && !tearing_down_) {
|
| - message_loop_->PostTask(FROM_HERE, base::Bind(
|
| - &Pipeline::PreloadChangedTask, this, preload));
|
| - }
|
| -}
|
| -
|
| base::TimeDelta Pipeline::GetCurrentTime() const {
|
| base::AutoLock auto_lock(lock_);
|
| return GetCurrentTime_Locked();
|
| @@ -323,7 +309,6 @@ void Pipeline::ResetState() {
|
| total_bytes_ = 0;
|
| natural_size_.SetSize(0, 0);
|
| volume_ = 1.0f;
|
| - preload_ = AUTO;
|
| playback_rate_ = 0.0f;
|
| pending_playback_rate_ = 0.0f;
|
| status_ = PIPELINE_OK;
|
| @@ -724,7 +709,6 @@ void Pipeline::InitializeTask(PipelineStatus last_stage_status) {
|
|
|
| // Initialization was successful, we are now considered paused, so it's safe
|
| // to set the initial playback rate and volume.
|
| - PreloadChangedTask(GetPreload());
|
| PlaybackRateChangedTask(GetPlaybackRate());
|
| VolumeChangedTask(GetVolume());
|
|
|
| @@ -842,15 +826,6 @@ void Pipeline::VolumeChangedTask(float volume) {
|
| audio_renderer_->SetVolume(volume);
|
| }
|
|
|
| -void Pipeline::PreloadChangedTask(Preload preload) {
|
| - DCHECK_EQ(MessageLoop::current(), message_loop_);
|
| - if (!running_ || tearing_down_)
|
| - return;
|
| -
|
| - if (demuxer_)
|
| - demuxer_->SetPreload(preload);
|
| -}
|
| -
|
| void Pipeline::SeekTask(base::TimeDelta time,
|
| const PipelineStatusCB& seek_cb) {
|
| DCHECK_EQ(MessageLoop::current(), message_loop_);
|
|
|