diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 15:30:33 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 15:30:33 +0000 |
| commit | be746249d9ba4f5d680c8f9654dd6a7e3f7a6492 (patch) | |
| tree | e0fc4c882de61b2ad90328bd1ab9e56fd7e7f73f /media | |
| parent | 584a34a532d9b515211216c0d7ef6fe71508184e (diff) | |
| download | chromium_src-be746249d9ba4f5d680c8f9654dd6a7e3f7a6492.zip chromium_src-be746249d9ba4f5d680c8f9654dd6a7e3f7a6492.tar.gz chromium_src-be746249d9ba4f5d680c8f9654dd6a7e3f7a6492.tar.bz2 | |
Revert r152236 since we found the culprit for bug 143440.
Turns out non-null media::Pipeline::pending_callbacks_ wasn't it -- on top the that we haven't received a single crash as a result of the CHECKs().
BUG=143539
TBR=jar
Review URL: https://chromiumcodereview.appspot.com/10867054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/pipeline.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index 4650e6e..7f6efde 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -424,7 +424,7 @@ TimeDelta Pipeline::TimeForByteOffset_Locked(int64 byte_offset) const { void Pipeline::DoPause(const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - CHECK(!pending_callbacks_.get()); + DCHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (audio_renderer_) @@ -438,7 +438,7 @@ void Pipeline::DoPause(const PipelineStatusCB& done_cb) { void Pipeline::DoFlush(const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - CHECK(!pending_callbacks_.get()); + DCHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (audio_renderer_) @@ -452,7 +452,7 @@ void Pipeline::DoFlush(const PipelineStatusCB& done_cb) { void Pipeline::DoPlay(const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - CHECK(!pending_callbacks_.get()); + DCHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (audio_renderer_) @@ -466,7 +466,7 @@ void Pipeline::DoPlay(const PipelineStatusCB& done_cb) { void Pipeline::DoStop(const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - CHECK(!pending_callbacks_.get()); + DCHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (demuxer_) @@ -877,7 +877,7 @@ void Pipeline::AudioDisabledTask() { void Pipeline::FilterStateTransitionTask() { DCHECK(message_loop_->BelongsToCurrentThread()); - CHECK(pending_callbacks_.get()) + DCHECK(pending_callbacks_.get()) << "Filter state transitions must be completed via pending_callbacks_"; pending_callbacks_.reset(); @@ -1197,7 +1197,7 @@ void Pipeline::DoSeek(base::TimeDelta seek_timestamp, bool skip_demuxer_seek, const PipelineStatusCB& done_cb) { DCHECK(message_loop_->BelongsToCurrentThread()); - CHECK(!pending_callbacks_.get()); + DCHECK(!pending_callbacks_.get()); SerialRunner::Queue bound_fns; if (!skip_demuxer_seek) { |