Reland of Delete cricket::VideoFrame::GetTimeStamp.

webrtc/media/base/fakevideorenderer.h

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
 #define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
 
 #include "webrtc/base/logging.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/media/base/videoframe.h"
 #include "webrtc/media/base/videosinkinterface.h"
 
 namespace cricket {
 
 // Faked video renderer that has a callback for actions on rendering.
 class FakeVideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   FakeVideoRenderer()
       : errors_(0),
         width_(0),
         height_(0),
         rotation_(webrtc::kVideoRotation_0),
-        timestamp_(0),
+        timestamp_us_(0),
         num_rendered_frames_(0),
         black_frame_(false) {}
 
   virtual void OnFrame(const VideoFrame& frame) {
     rtc::CritScope cs(&crit_);
     // TODO(zhurunz) Check with VP8 team to see if we can remove this
     // tolerance on Y values. Some unit tests produce Y values close
     // to 16 rather than close to zero, for supposedly black frames.
     // Largest value observed is 34, e.g., running
     // P2PTestConductor.LocalP2PTest16To9 (peerconnection_unittests).
     black_frame_ = CheckFrameColorYuv(0, 48, 128, 128, 128, 128, &frame);
     // Treat unexpected frame size as error.
     ++num_rendered_frames_;
     width_ = frame.width();
     height_ = frame.height();
     rotation_ = frame.rotation();
-    timestamp_ = frame.GetTimeStamp();
+    timestamp_us_ = frame.timestamp_us();
     SignalRenderFrame(&frame);
   }
 
   int errors() const { return errors_; }
   int width() const {
     rtc::CritScope cs(&crit_);
     return width_;
   }
   int height() const {
     rtc::CritScope cs(&crit_);
     return height_;
   }
   webrtc::VideoRotation rotation() const {
     rtc::CritScope cs(&crit_);
     return rotation_;
   }
 
-  int64_t timestamp() const {
+  int64_t timestamp_us() const {
     rtc::CritScope cs(&crit_);
-    return timestamp_;
+    return timestamp_us_;
   }
   int num_rendered_frames() const {
     rtc::CritScope cs(&crit_);
     return num_rendered_frames_;
   }
   bool black_frame() const {
     rtc::CritScope cs(&crit_);
     return black_frame_;
   }
 
@@ skipping 49 matching lines @@
       u_pos += u_pitch;
       v_pos += v_pitch;
     }
     return true;
   }
 
   int errors_;
   int width_;
   int height_;
   webrtc::VideoRotation rotation_;
-  int64_t timestamp_;
+  int64_t timestamp_us_;
   int num_rendered_frames_;
   bool black_frame_;
   rtc::CriticalSection crit_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_