Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

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

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
« no previous file with comments | « media/base/clock.h ('k') | media/base/clock_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/media/base/clock_impl.h:r21882
OLDNEW
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 // An implementation of Clock based on the system clock. ClockImpl uses linear 5 // An implementation of Clock based on the system clock. ClockImpl uses linear
6 // interpolation to calculate the current media time since the last time 6 // interpolation to calculate the current media time since the last time
7 // SetTime() was called. 7 // SetTime() was called.
8 // 8 //
9 // ClockImpl is not thread-safe and must be externally locked. 9 // ClockImpl is not thread-safe and must be externally locked.
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 // Current playback rate. 52 // Current playback rate.
53 float playback_rate_; 53 float playback_rate_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(ClockImpl); 55 DISALLOW_COPY_AND_ASSIGN(ClockImpl);
56 }; 56 };
57 57
58 } // namespace media 58 } // namespace media
59 59
60 #endif // MEDIA_BASE_CLOCK_IMPL_H_ 60 #endif // MEDIA_BASE_CLOCK_IMPL_H_
OLDNEW
« no previous file with comments | « media/base/clock.h ('k') | media/base/clock_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698