RTC Video Encoder: Use capturer timestamp

media/gpu/v4l2_video_encode_accelerator.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/gpu/v4l2_video_encode_accelerator.h"
 
 #include <fcntl.h>
 #include <linux/videodev2.h>
 #include <poll.h>
 #include <string.h>
@@ skipping 646 matching lines @@
       memcpy(target_data, output_data, output_size);
     }
 
     DVLOG(3) << "Dequeue(): returning "
                 "bitstream_buffer_id="
              << output_record.buffer_ref->id << ", size=" << output_size
              << ", key_frame=" << key_frame;
     child_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&Client::BitstreamBufferReady, client_,
-                   output_record.buffer_ref->id, output_size, key_frame));
+                   output_record.buffer_ref->id, output_size, key_frame,
+                   base::TimeDelta::FromMicroseconds(
+                       static_cast<int64_t>(dqbuf.timestamp.tv_usec))));

[Pawel Osciak, 2016/05/23 07:15:53]

Do we need the cast? Also, we need both tv_sec and tv_usec parts of
dqbuf.timestamp to recreate the original timestamp?

[shenghao, 2016/05/24 10:50:19]

Removed the cast. I think we only need the usec to recreate the original
timestamp

[Pawel Osciak, 2016/05/26 07:39:23]

We need both, usec only stores < 1s part of the value.

[shenghao, 2016/05/26 10:38:20]

Done.

     output_record.at_device = false;
     output_record.buffer_ref.reset();
     free_output_buffers_.push_back(dqbuf.index);
     output_buffer_queued_count_--;
   }
 }
 
 bool V4L2VideoEncodeAccelerator::EnqueueInputRecord() {
   DVLOG(3) << "EnqueueInputRecord()";
   DCHECK(!free_input_buffers_.empty());
   DCHECK(!encoder_input_queue_.empty());
 
   // Enqueue an input (VIDEO_OUTPUT) buffer.
   scoped_refptr<media::VideoFrame> frame = encoder_input_queue_.front();
   const int index = free_input_buffers_.back();
   InputRecord& input_record = input_buffer_map_[index];
   DCHECK(!input_record.at_device);
   struct v4l2_buffer qbuf;
   struct v4l2_plane qbuf_planes[VIDEO_MAX_PLANES];
   memset(&qbuf, 0, sizeof(qbuf));
   memset(qbuf_planes, 0, sizeof(qbuf_planes));
   qbuf.index = index;
   qbuf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   qbuf.m.planes = qbuf_planes;
+  struct timeval timestamp;
+  timestamp.tv_sec = static_cast<time_t>(frame->timestamp().InSeconds());
+  timestamp.tv_usec =

[Pawel Osciak, 2016/05/23 07:15:52]

I'm wondering if we need the casts?

[shenghao, 2016/05/24 10:50:19]

Done.

+      static_cast<suseconds_t>(frame->timestamp().InMicroseconds());
+  qbuf.timestamp = timestamp;
 

[Pawel Osciak, 2016/05/23 07:15:52]

Do we need the temporary timestamp, could we just assign directly to
qbuf.timestamp ?

[shenghao, 2016/05/24 10:50:19]

Done.

   DCHECK_EQ(device_input_format_, frame->format());
   for (size_t i = 0; i < input_planes_count_; ++i) {
     qbuf.m.planes[i].bytesused = base::checked_cast<__u32>(
         media::VideoFrame::PlaneSize(frame->format(), i, input_allocated_size_)
             .GetArea());
 
     switch (input_memory_type_) {
       case V4L2_MEMORY_USERPTR:
         qbuf.m.planes[i].length = qbuf.m.planes[i].bytesused;
         qbuf.m.planes[i].m.userptr =
@@ skipping 541 matching lines @@
   reqbufs.count = 0;
   reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   reqbufs.memory = V4L2_MEMORY_MMAP;
   IOCTL_OR_LOG_ERROR(VIDIOC_REQBUFS, &reqbufs);
 
   output_buffer_map_.clear();
   free_output_buffers_.clear();
 }
 
 }  // namespace media