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

Unified Diff: media/base/clock.cc

Issue 294133003: Extract media::Clock::IsPlaying() into media::Pipeline::ClockState enum. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes + rebase Created 6 years, 7 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
« no previous file with comments | « media/base/clock.h ('k') | media/base/pipeline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/clock.cc
diff --git a/media/base/clock.cc b/media/base/clock.cc
index ea954834e94d3c4138313bc922123e71981eb1a3..3dc49e9e79cbbd4572433ca1d0fdd3c6dd67b44d 100644
--- a/media/base/clock.cc
+++ b/media/base/clock.cc
@@ -12,9 +12,14 @@
namespace media {
-Clock::Clock(base::TickClock* clock) : clock_(clock) {
+Clock::Clock(base::TickClock* clock)
+ : clock_(clock),
+ playing_(false),
+ underflow_(false),
+ playback_rate_(1.0f),
+ max_time_(kNoTimestamp()),
+ duration_(kNoTimestamp()) {
DCHECK(clock_);
- Reset();
}
Clock::~Clock() {}
@@ -103,11 +108,6 @@ base::TimeDelta Clock::ClampToValidTimeRange(base::TimeDelta time) const {
return std::max(std::min(time, duration_), base::TimeDelta());
}
-void Clock::EndOfStream() {
- Pause();
- SetTime(Duration(), Duration());
-}
-
base::TimeDelta Clock::Duration() const {
if (duration_ == kNoTimestamp())
return base::TimeDelta();
@@ -127,14 +127,4 @@ base::TimeDelta Clock::EstimatedElapsedTime() {
return ClampToValidTimeRange(ElapsedViaProvidedTime(clock_->NowTicks()));
}
-void Clock::Reset() {
- playing_ = false;
- playback_rate_ = 1.0f;
- max_time_ = kNoTimestamp();
- duration_ = kNoTimestamp();
- media_time_ = base::TimeDelta();
- reference_ = base::TimeTicks();
- underflow_ = false;
-}
-
} // namespace media
« no previous file with comments | « media/base/clock.h ('k') | media/base/pipeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698