media/base/pipeline_impl.cc - Issue 164196: Merge 21937 - Nice and easy fix for the media clock interpolating past the du...

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_impl.cc

Issue 164196: Merge 21937 - Nice and easy fix for the media clock interpolating past the du... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/

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

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

Download patch

Index: media/base/pipeline_impl.cc

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

--- media/base/pipeline_impl.cc (revision 22806)

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

@@ -202,7 +202,11 @@

base::TimeDelta PipelineImpl::GetCurrentTime() const {

AutoLock auto_lock(lock_);

- return clock_.Elapsed();

+ base::TimeDelta elapsed = clock_.Elapsed();

+ if (elapsed > duration_) {

+ return duration_;

+ }

+ return elapsed;

}

base::TimeDelta PipelineImpl::GetBufferedTime() const {

Property changes on: media\base\pipeline_impl.cc

___________________________________________________________________

Modified: svn:mergeinfo

Merged /trunk/src/media/base/pipeline_impl.cc:r21937

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