media/base/pipeline.cc - Issue 416393003: Make Demuxer::Stop() synchronous.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/pipeline.cc

Issue 416393003: Make Demuxer::Stop() synchronous. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix android Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/base/pipeline.cc

diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc

index 70aa2a4e1239a2eb9b4bdafe366900a16eda4631..486bfaba1a370847d3f221121162791217983ab9 100644

--- a/media/base/pipeline.cc

+++ b/media/base/pipeline.cc

@@ -410,8 +410,8 @@ void Pipeline::DoStop(const PipelineStatusCB& done_cb) {

text_renderer_.reset();

if (demuxer_) {

- demuxer_->Stop(base::Bind(done_cb, PIPELINE_OK));

- return;

+ demuxer_->Stop();

+ demuxer_ = NULL;

}

task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK));

« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline_unittest.cc » ('j') | no next file with comments »