Decouple capture timestamp and reference time

content/browser/renderer_host/media/video_capture_controller.cc

Index: content/browser/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index f10f85ff12789ac811a95bd9193d24c5508df81c..094dfc1626b94f023515461f5767f55f9c49f1f3 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -357,7 +357,7 @@ VideoCaptureController::~VideoCaptureController() {
 void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
     std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
     const scoped_refptr<VideoFrame>& frame,
-    const base::TimeTicks& timestamp) {
+    base::TimeTicks reference_time) {

[miu, 2016/06/07 20:03:47]

(See comment for video_capture_host.cc.) You could have the caller of this
method (or some caller further upstream) set the REFERENCE_TIME field in
|frame|'s metadata. Then, you don't need the 3rd argument to this method.

[qiangchen, 2016/06/08 18:04:30]

Done.

   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   const int buffer_id = buffer->id();
   DCHECK_NE(buffer_id, VideoCaptureBufferPool::kInvalidId);
@@ -396,10 +396,8 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
       if (is_new_buffer)
         DoNewBufferOnIOThread(client, buffer.get(), frame);
 
-      client->event_handler->OnBufferReady(client->controller_id,
-                                           buffer_id,
-                                           frame,
-                                           timestamp);
+      client->event_handler->OnBufferReady(client->controller_id, buffer_id,
+                                           frame, reference_time);
       const bool inserted =
           client->active_buffers.insert(std::make_pair(buffer_id, frame))
               .second;