Decouple capture timestamp and reference time

content/browser/renderer_host/media/video_capture_device_client.cc

Index: content/browser/renderer_host/media/video_capture_device_client.cc
diff --git a/content/browser/renderer_host/media/video_capture_device_client.cc b/content/browser/renderer_host/media/video_capture_device_client.cc
index cf6ad3a98149ed256c83dce37eb3a833c8426cf4..69fbb2df1a930766a4f9d653c08fa257b2571bc0 100644
--- a/content/browser/renderer_host/media/video_capture_device_client.cc
+++ b/content/browser/renderer_host/media/video_capture_device_client.cc
@@ -85,7 +85,8 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
     int length,
     const VideoCaptureFormat& frame_format,
     int rotation,
-    const base::TimeTicks& timestamp) {
+    base::TimeTicks reference_time,
+    base::TimeDelta timestamp) {
   TRACE_EVENT0("video", "VideoCaptureDeviceClient::OnIncomingCapturedData");
   DCHECK_EQ(media::PIXEL_STORAGE_CPU, frame_format.pixel_storage);
 
@@ -224,8 +225,8 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
     } else if (status == VideoCaptureGpuJpegDecoder::INIT_PASSED &&
         frame_format.pixel_format == media::PIXEL_FORMAT_MJPEG &&
         rotation == 0 && !flip) {
-      external_jpeg_decoder_->DecodeCapturedData(data, length, frame_format,
-                                                 timestamp, std::move(buffer));
+      external_jpeg_decoder_->DecodeCapturedData(
+          data, length, frame_format, reference_time, std::move(buffer));
       return;
     }
   }
@@ -254,7 +255,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
   const VideoCaptureFormat output_format = VideoCaptureFormat(
       dimensions, frame_format.frame_rate,
       media::PIXEL_FORMAT_I420, output_pixel_storage);
-  OnIncomingCapturedBuffer(std::move(buffer), output_format, timestamp);
+  OnIncomingCapturedBuffer(std::move(buffer), output_format, reference_time);

[miu, 2016/05/18 22:35:40]

See comment I made in video_capture_device.h. You'll want to continue passing
the frame |timestamp| through here and into OnIncomingCapturedBuffer().

[qiangchen, 2016/05/20 17:55:14]

Done.

 }
 
 std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>