diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 20:35:09 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 20:35:09 +0000 |
commit | 133ef817bc668cdec3e9212588fb0f04832ba481 (patch) | |
tree | 8ba017beb20a3de0af81a15c6857af39130af7ea /media | |
parent | 8643e6d85c2a41d6497d5cb9b69bea9465102e96 (diff) | |
download | chromium_src-133ef817bc668cdec3e9212588fb0f04832ba481.zip chromium_src-133ef817bc668cdec3e9212588fb0f04832ba481.tar.gz chromium_src-133ef817bc668cdec3e9212588fb0f04832ba481.tar.bz2 |
Fix indentation in media/base/pipeline.cc.
TBR=fischman
Review URL: https://chromiumcodereview.appspot.com/9250012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r-- | media/base/pipeline.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index 2eeefff..39bd6db 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -87,8 +87,8 @@ Pipeline::~Pipeline() { } void Pipeline::Init(const PipelineStatusCB& ended_callback, - const PipelineStatusCB& error_callback, - const NetworkEventCB& network_callback) { + const PipelineStatusCB& error_callback, + const NetworkEventCB& network_callback) { DCHECK(!IsRunning()) << "Init() should be called before the pipeline has started"; ended_callback_ = ended_callback; @@ -98,8 +98,8 @@ void Pipeline::Init(const PipelineStatusCB& ended_callback, // Creates the PipelineInternal and calls it's start method. bool Pipeline::Start(scoped_ptr<FilterCollection> collection, - const std::string& url, - const PipelineStatusCB& start_callback) { + const std::string& url, + const PipelineStatusCB& start_callback) { base::AutoLock auto_lock(lock_); if (running_) { @@ -137,7 +137,7 @@ void Pipeline::Stop(const PipelineStatusCB& stop_callback) { } void Pipeline::Seek(base::TimeDelta time, - const PipelineStatusCB& seek_callback) { + const PipelineStatusCB& seek_callback) { base::AutoLock auto_lock(lock_); if (!running_) { VLOG(1) << "Media pipeline must be running"; @@ -622,8 +622,8 @@ void Pipeline::OnUpdateStatistics(const PipelineStatistics& stats) { } void Pipeline::StartTask(scoped_ptr<FilterCollection> filter_collection, - const std::string& url, - const PipelineStatusCB& start_callback) { + const std::string& url, + const PipelineStatusCB& start_callback) { DCHECK_EQ(MessageLoop::current(), message_loop_); DCHECK_EQ(kCreated, state_); filter_collection_ = filter_collection.Pass(); @@ -865,7 +865,7 @@ void Pipeline::PreloadChangedTask(Preload preload) { } void Pipeline::SeekTask(base::TimeDelta time, - const PipelineStatusCB& seek_callback) { + const PipelineStatusCB& seek_callback) { DCHECK_EQ(MessageLoop::current(), message_loop_); DCHECK(!IsPipelineStopPending()); @@ -1376,10 +1376,8 @@ void Pipeline::DoSeek(base::TimeDelta seek_timestamp) { // DCHECK(). Further investigation is needed to make sure this won't introduce // a bug. if (demuxer_) { - demuxer_->Seek(seek_timestamp, - base::Bind(&Pipeline::OnDemuxerSeekDone, - this, - seek_timestamp)); + demuxer_->Seek(seek_timestamp, base::Bind( + &Pipeline::OnDemuxerSeekDone, this, seek_timestamp)); return; } @@ -1387,7 +1385,7 @@ void Pipeline::DoSeek(base::TimeDelta seek_timestamp) { } void Pipeline::OnDemuxerSeekDone(base::TimeDelta seek_timestamp, - PipelineStatus status) { + PipelineStatus status) { if (MessageLoop::current() != message_loop_) { message_loop_->PostTask(FROM_HERE, base::Bind( &Pipeline::OnDemuxerSeekDone, this, seek_timestamp, status)); |