media/base/clock_impl.cc - Issue 165163: Merge 21882 - Implemented a proper clock for audio/video synchronization....

Side by Side Diff

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

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

Side by Side Diff: media/base/clock_impl.cc

Issue 165163: Merge 21882 - Implemented a proper clock for audio/video synchronization.... (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 unified diff | Download patch | Annotate | Revision Log

Property Changes:

Added: svn:mergeinfo
Merged /trunk/src/media/base/clock_impl.cc:r21882

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

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/logging.h"	5 #include "base/logging.h"

6 #include "media/base/clock_impl.h"	6 #include "media/base/clock_impl.h"

7	7

8 namespace media {	8 namespace media {

9	9

10 ClockImpl::ClockImpl(TimeProvider* time_provider)	10 ClockImpl::ClockImpl(TimeProvider* time_provider)

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56	56

57 base::TimeDelta ClockImpl::ElapsedViaProvidedTime(	57 base::TimeDelta ClockImpl::ElapsedViaProvidedTime(

58 const base::Time& time) const {	58 const base::Time& time) const {

59 // TODO(scherkus): floating point badness scaling time by playback rate.	59 // TODO(scherkus): floating point badness scaling time by playback rate.

60 int64 now_us = (time - reference_).InMicroseconds();	60 int64 now_us = (time - reference_).InMicroseconds();

61 now_us = static_cast<int64>(now_us * playback_rate_);	61 now_us = static_cast<int64>(now_us * playback_rate_);

62 return media_time_ + base::TimeDelta::FromMicroseconds(now_us);	62 return media_time_ + base::TimeDelta::FromMicroseconds(now_us);

63 }	63 }

64	64

65 } // namespace media	65 } // namespace media

OLD	NEW