Remove cricket::VideoFrame::Set/GetElapsedTime()

talk/app/webrtc/androidvideocapturer.cc

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 25 matching lines @@
 // A hack for avoiding deep frame copies in
 // cricket::VideoCapturer.SignalFrameCaptured() using a custom FrameFactory.
 // A frame is injected using UpdateCapturedFrame(), and converted into a
 // cricket::VideoFrame with CreateAliasedFrame(). UpdateCapturedFrame() should
 // be called before CreateAliasedFrame() for every frame.
 // TODO(magjed): Add an interface cricket::VideoCapturer::OnFrameCaptured()
 // for ref counted I420 frames instead of this hack.
 class AndroidVideoCapturer::FrameFactory : public cricket::VideoFrameFactory {
  public:
   FrameFactory(const rtc::scoped_refptr<AndroidVideoCapturerDelegate>& delegate)
-      : start_time_(rtc::TimeNanos()), delegate_(delegate) {
+      : delegate_(delegate) {
     // Create a CapturedFrame that only contains header information, not the
     // actual pixel data.
     captured_frame_.pixel_height = 1;
     captured_frame_.pixel_width = 1;
     captured_frame_.data = nullptr;
     captured_frame_.data_size = cricket::CapturedFrame::kUnknownDataSize;
     captured_frame_.fourcc = static_cast<uint32>(cricket::FOURCC_ANY);
   }
 
   void UpdateCapturedFrame(
       const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
       int rotation,
       int64 time_stamp_in_ns) {
     buffer_ = buffer;
     captured_frame_.width = buffer->width();
     captured_frame_.height = buffer->height();
-    captured_frame_.elapsed_time = rtc::TimeNanos() - start_time_;
     captured_frame_.time_stamp = time_stamp_in_ns;
     captured_frame_.rotation = rotation;
   }
 
   void ClearCapturedFrame() {
     buffer_ = nullptr;
     captured_frame_.width = 0;
     captured_frame_.height = 0;
-    captured_frame_.elapsed_time = 0;
     captured_frame_.time_stamp = 0;
   }
 
   const cricket::CapturedFrame* GetCapturedFrame() const {
     return &captured_frame_;
   }
 
   cricket::VideoFrame* CreateAliasedFrame(
       const cricket::CapturedFrame* captured_frame,
       int dst_width,
       int dst_height) const override {
     // Check that captured_frame is actually our frame.
     RTC_CHECK(captured_frame == &captured_frame_);
     rtc::scoped_ptr<cricket::VideoFrame> frame(new cricket::WebRtcVideoFrame(
         ShallowCenterCrop(buffer_, dst_width, dst_height),
-        captured_frame->elapsed_time, captured_frame->time_stamp,
-        captured_frame->GetRotation()));
+        captured_frame->time_stamp, captured_frame->GetRotation()));
     // Caller takes ownership.
     // TODO(magjed): Change CreateAliasedFrame() to return a rtc::scoped_ptr.
     return apply_rotation_ ? frame->GetCopyWithRotationApplied()->Copy()
                            : frame.release();
   }
 
  private:
-  uint64 start_time_;
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer_;
   cricket::CapturedFrame captured_frame_;
   rtc::scoped_refptr<AndroidVideoCapturerDelegate> delegate_;
 };
 
 AndroidVideoCapturer::AndroidVideoCapturer(
     const rtc::scoped_refptr<AndroidVideoCapturerDelegate>& delegate)
     : running_(false),
       delegate_(delegate),
       frame_factory_(NULL),
@@ skipping 106 matching lines @@
 
 bool AndroidVideoCapturer::GetBestCaptureFormat(
     const cricket::VideoFormat& desired,
     cricket::VideoFormat* best_format) {
   // Delegate this choice to VideoCapturerAndroid.startCapture().
   *best_format = desired;
   return true;
 }
 
 }  // namespace webrtc