Commit 2ad2103e authored by scherkus@chromium.org's avatar scherkus@chromium.org

Downgrade media::Pipeline CHECKs into NOTREACHED() + no-op.

r150930 set Pipeline::running_ to false when an error is encountered as opposed to keeping the Pipeline running. The end result is that an in-flight Seek() can hit CHECK(running_). We want a no-op in that situation in release mode, not a process crash.

BUG=141923
TBR=fischman

Review URL: https://chromiumcodereview.appspot.com/10855167

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151662 0039d316-1c4b-4281-b951-d872f2087c98
parent a853f37e
...@@ -110,7 +110,10 @@ void Pipeline::Start(scoped_ptr<FilterCollection> collection, ...@@ -110,7 +110,10 @@ void Pipeline::Start(scoped_ptr<FilterCollection> collection,
const PipelineStatusCB& error_cb, const PipelineStatusCB& error_cb,
const PipelineStatusCB& start_cb) { const PipelineStatusCB& start_cb) {
base::AutoLock auto_lock(lock_); base::AutoLock auto_lock(lock_);
CHECK(!running_) << "Media pipeline is already running"; if (running_) {
NOTREACHED() << "Media pipeline is already running";
return;
}
running_ = true; running_ = true;
message_loop_->PostTask(FROM_HERE, base::Bind( message_loop_->PostTask(FROM_HERE, base::Bind(
...@@ -126,7 +129,10 @@ void Pipeline::Stop(const base::Closure& stop_cb) { ...@@ -126,7 +129,10 @@ void Pipeline::Stop(const base::Closure& stop_cb) {
void Pipeline::Seek(TimeDelta time, const PipelineStatusCB& seek_cb) { void Pipeline::Seek(TimeDelta time, const PipelineStatusCB& seek_cb) {
base::AutoLock auto_lock(lock_); base::AutoLock auto_lock(lock_);
CHECK(running_) << "Media pipeline isn't running"; if (!running_) {
NOTREACHED() << "Media pipeline isn't running";
return;
}
message_loop_->PostTask(FROM_HERE, base::Bind( message_loop_->PostTask(FROM_HERE, base::Bind(
&Pipeline::SeekTask, this, time, seek_cb)); &Pipeline::SeekTask, this, time, seek_cb));
......
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