Pass a TimeTicks along video capture pipeline to represent capture time

content/renderer/media/video_track_adapter.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 "content/renderer/media/video_track_adapter.h"
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 
@@ skipping 38 matching lines @@
   // |callback| will however be released on the main render thread.
   void AddCallback(const MediaStreamVideoTrack* track,
                    const VideoCaptureDeliverFrameCB& callback);
 
   // Removes |callback| associated with |track| from receiving video frames if
   // |track| has been added. It is ok to call RemoveCallback even if the |track|
   // has not been added. The |callback| is released on the main render thread.
   void RemoveCallback(const MediaStreamVideoTrack* track);
 
   void DeliverFrame(const scoped_refptr<media::VideoFrame>& frame,
-                    const media::VideoCaptureFormat& format);
+                    const media::VideoCaptureFormat& format,
+                    const base::TimeTicks& estimated_capture_time);
 
   // Returns true if all arguments match with the output of this adapter.
   bool ConstraintsMatch(int max_width,
                         int max_height,
                         double min_aspect_ratio,
                         double max_aspect_ratio) const;
 
   bool IsEmpty() const;
 
  private:
   virtual ~VideoFrameResolutionAdapter();
   friend class base::RefCountedThreadSafe<VideoFrameResolutionAdapter>;
 
   virtual void DoDeliverFrame(
       const scoped_refptr<media::VideoFrame>& frame,
-      const media::VideoCaptureFormat& format);
+      const media::VideoCaptureFormat& format,
+      const base::TimeTicks& estimated_capture_time);
 
   // Bound to the IO-thread.
   base::ThreadChecker io_thread_checker_;
 
   // The task runner where we will release VideoCaptureDeliverFrameCB
   // registered in AddCallback.
   scoped_refptr<base::SingleThreadTaskRunner> renderer_task_runner_;
 
   gfx::Size max_frame_size_;
   double min_aspect_ratio_;
@@ skipping 29 matching lines @@
 }
 
 VideoTrackAdapter::
 VideoFrameResolutionAdapter::~VideoFrameResolutionAdapter() {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   DCHECK(callbacks_.empty());
 }
 
 void VideoTrackAdapter::VideoFrameResolutionAdapter::DeliverFrame(
     const scoped_refptr<media::VideoFrame>& frame,
-    const media::VideoCaptureFormat& format) {
+    const media::VideoCaptureFormat& format,
+    const base::TimeTicks& estimated_capture_time) {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   // TODO(perkj): Allow cropping / scaling of textures once
   // http://crbug/362521 is fixed.
   if (frame->format() == media::VideoFrame::NATIVE_TEXTURE) {
-    DoDeliverFrame(frame, format);
+    DoDeliverFrame(frame, format, estimated_capture_time);
     return;
   }
   scoped_refptr<media::VideoFrame> video_frame(frame);
   double input_ratio =
       static_cast<double>(frame->natural_size().width()) /
       frame->natural_size().height();
 
   // If |frame| has larger width or height than requested, or the aspect ratio
   // does not match the requested, we want to create a wrapped version of this
   // frame with a size that fulfills the constraints.
@@ skipping 41 matching lines @@
         region_in_frame,
         desired_size,
         base::Bind(&ReleaseOriginalFrame, frame));
 
     DVLOG(3) << "desired size  " << desired_size.ToString()
              << " output natural size "
              << video_frame->natural_size().ToString()
              << " output visible rect  "
              << video_frame->visible_rect().ToString();
   }
-  DoDeliverFrame(video_frame, format);
+  DoDeliverFrame(video_frame, format, estimated_capture_time);
 }
 
 void VideoTrackAdapter::
 VideoFrameResolutionAdapter::DoDeliverFrame(
     const scoped_refptr<media::VideoFrame>& frame,
-    const media::VideoCaptureFormat& format) {
+    const media::VideoCaptureFormat& format,
+    const base::TimeTicks& estimated_capture_time) {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   for (std::vector<VideoIdCallbackPair>::const_iterator it = callbacks_.begin();
        it != callbacks_.end(); ++it) {
-    it->second.Run(frame, format);
+    it->second.Run(frame, format, estimated_capture_time);
   }
 }
 
 void VideoTrackAdapter::VideoFrameResolutionAdapter::AddCallback(
     const MediaStreamVideoTrack* track,
     const VideoCaptureDeliverFrameCB& callback) {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   callbacks_.push_back(std::make_pair(track, callback));
 }
 
@@ skipping 103 matching lines @@
     (*it)->RemoveCallback(track);
     if ((*it)->IsEmpty()) {
       adapters_.erase(it);
       break;
     }
   }
 }
 
 void VideoTrackAdapter::DeliverFrameOnIO(
     const scoped_refptr<media::VideoFrame>& frame,
-    const media::VideoCaptureFormat& format) {
+    const media::VideoCaptureFormat& format,
+    const base::TimeTicks& estimated_capture_time) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   TRACE_EVENT0("video", "VideoTrackAdapter::DeliverFrameOnIO");
   for (FrameAdapters::iterator it = adapters_.begin();
        it != adapters_.end(); ++it) {
-    (*it)->DeliverFrame(frame, format);
+    (*it)->DeliverFrame(frame, format, estimated_capture_time);
   }
 }
 
 }  // namespace content