Decouple capture timestamp and reference time

media/capture/content/thread_safe_capture_oracle.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/capture/content/thread_safe_capture_oracle.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 184 matching lines @@
   if (client_)
     client_->OnError(from_here, reason);
 }
 
 void ThreadSafeCaptureOracle::DidCaptureFrame(
     int frame_number,
     std::unique_ptr<VideoCaptureDevice::Client::Buffer> buffer,
     base::TimeTicks capture_begin_time,
     base::TimeDelta estimated_frame_duration,
     const scoped_refptr<VideoFrame>& frame,
-    base::TimeTicks timestamp,
+    base::TimeTicks reference_time,
     bool success) {
   TRACE_EVENT_ASYNC_END2("gpu.capture", "Capture", buffer.get(), "success",
-                         success, "timestamp", timestamp.ToInternalValue());
+                         success, "timestamp",
+                         reference_time.ToInternalValue());
 
   base::AutoLock guard(lock_);
 
-  if (oracle_.CompleteCapture(frame_number, success, &timestamp)) {
+  if (oracle_.CompleteCapture(frame_number, success, &reference_time)) {
     TRACE_EVENT_INSTANT0("gpu.capture", "CaptureSucceeded",
                          TRACE_EVENT_SCOPE_THREAD);
 
     if (!client_)
       return;  // Capture is stopped.
 
     frame->metadata()->SetDouble(VideoFrameMetadata::FRAME_RATE,
                                  params_.requested_format.frame_rate);
     frame->metadata()->SetTimeTicks(VideoFrameMetadata::CAPTURE_BEGIN_TIME,
                                     capture_begin_time);
     frame->metadata()->SetTimeTicks(VideoFrameMetadata::CAPTURE_END_TIME,
                                     base::TimeTicks::Now());
     frame->metadata()->SetTimeDelta(VideoFrameMetadata::FRAME_DURATION,
                                     estimated_frame_duration);
+    frame->metadata()->SetTimeTicks(VideoFrameMetadata::REFERENCE_TIME,
+                                    reference_time);
 
     frame->AddDestructionObserver(
         base::Bind(&ThreadSafeCaptureOracle::DidConsumeFrame, this,
                    frame_number, frame->metadata()));
 
-    client_->OnIncomingCapturedVideoFrame(std::move(buffer), frame, timestamp);
+    client_->OnIncomingCapturedVideoFrame(std::move(buffer), frame);
   }
 }
 
 void ThreadSafeCaptureOracle::DidConsumeFrame(
     int frame_number,
     const media::VideoFrameMetadata* metadata) {
   // Note: This function may be called on any thread by the VideoFrame
   // destructor.  |metadata| is still valid for read-access at this point.
   double utilization = -1.0;
   if (metadata->GetDouble(media::VideoFrameMetadata::RESOURCE_UTILIZATION,
                           &utilization)) {
     base::AutoLock guard(lock_);
     oracle_.RecordConsumerFeedback(frame_number, utilization);
   }
 }
 
 }  // namespace media