media/base/pipeline.cc - Issue 9269027: Revert 118546 because it caused PrerenderHTML5VideoNetwork to timeout on windows and linux

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 9269027: Revert 118546 because it caused PrerenderHTML5VideoNetwork to timeout on windows and linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 11 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:

View side-by-side diff with in-line comments

Download patch

Index: media/base/pipeline.cc

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

--- media/base/pipeline.cc (revision 118589)

+++ media/base/pipeline.cc (working copy)

@@ -1020,8 +1020,11 @@

// Start monitoring rate of downloading.

int bitrate = 0;

- if (demuxer_.get())

+ if (demuxer_.get()) {

bitrate = demuxer_->GetBitrate();

+ local_source_ = demuxer_->IsLocalSource();

+ streaming_ = !demuxer_->IsSeekable();

+ }

// Needs to be locked because most other calls to |download_rate_monitor_|

// occur on the renderer thread.

download_rate_monitor_.Start(

@@ -1136,9 +1139,6 @@

}

demuxer_ = demuxer;

- // Set fields obtained from demuxer.

- local_source_ = demuxer_->IsLocalSource();

- streaming_ = !demuxer_->IsSeekable();

demuxer_->set_host(this);

{

« no previous file with comments | « media/base/download_rate_monitor_unittest.cc ('k') | webkit/media/buffered_data_source.cc » ('j') | no next file with comments »