media/filters/chunk_demuxer.cc - Issue 11142029: Merge 161369 - Clear source_id_{audio,video}_ after RemoveId.

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/filters/chunk_demuxer.cc

Issue 11142029: Merge 161369 - Clear source_id_{audio,video}_ after RemoveId. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/

Patch Set: Created 8 years, 2 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/filters/chunk_demuxer.cc

===================================================================

--- media/filters/chunk_demuxer.cc (revision 162008)

+++ media/filters/chunk_demuxer.cc (working copy)

@@ -708,11 +708,17 @@

stream_parser_map_.erase(id);

source_info_map_.erase(id);

- if (source_id_audio_ == id && audio_)

- audio_->Shutdown();

+ if (source_id_audio_ == id) {

+ if (audio_)

+ audio_->Shutdown();

+ source_id_audio_.clear();

+ }

- if (source_id_video_ == id && video_)

- video_->Shutdown();

+ if (source_id_video_ == id) {

+ if (video_)

+ video_->Shutdown();

+ source_id_video_.clear();

+ }

}

Ranges<TimeDelta> ChunkDemuxer::GetBufferedRanges(const std::string& id) const {

« no previous file with comments | « no previous file | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »