commit ed4cb565759332cecc012ddf181915ca630fddf2
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue May 06 04:50:49 2014
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue May 06 04:50:49 2014
tree 68fee6cd6058646806b67c506b959a4c8d89e130
parent 5ee0f05d5fbb3fbe4862a76ab75d08ae846e6141

Remove timestamp_extrapolator's dependency to Clock and vcm defines.

TEST=existing tests
BUG=
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12399004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6058 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/video_coding/main/source/timing.cc

diff --git a/webrtc/modules/video_coding/main/source/timing.cc b/webrtc/modules/video_coding/main/source/timing.cc
index e5b5635..dd82187 100644
--- a/webrtc/modules/video_coding/main/source/timing.cc
+++ b/webrtc/modules/video_coding/main/source/timing.cc
@@ -35,7 +35,8 @@
       prev_frame_timestamp_(0) {
   if (master_timing == NULL) {
     master_ = true;
-    ts_extrapolator_ = new VCMTimestampExtrapolator(clock_);
+    ts_extrapolator_ =
+        new VCMTimestampExtrapolator(clock_->TimeInMilliseconds());
   } else {
     ts_extrapolator_ = master_timing->ts_extrapolator_;
   }
@@ -50,7 +51,7 @@
 
 void VCMTiming::Reset() {
   CriticalSectionScoped cs(crit_sect_);
-  ts_extrapolator_->Reset();
+  ts_extrapolator_->Reset(clock_->TimeInMilliseconds());
   codec_timer_.Reset();
   render_delay_ms_ = kDefaultRenderDelayMs;
   min_playout_delay_ms_ = 0;