Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Unified Diff: media/capture/video/linux/v4l2_capture_delegate.cc

Issue 1983193002: Decouple capture timestamp and reference time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve Comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/capture/video/linux/v4l2_capture_delegate.cc
diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
index bc0ef75917d55b539f831edd49294446ac5bc893..1be193857fe028f5a536961c13289c75be9a742c 100644
--- a/media/capture/video/linux/v4l2_capture_delegate.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate.cc
@@ -390,9 +390,13 @@ void V4L2CaptureDelegate::DoCapture() {
buffer_tracker_pool_[buffer.index]->set_payload_size(buffer.bytesused);
const scoped_refptr<BufferTracker>& buffer_tracker =
buffer_tracker_pool_[buffer.index];
+
+ base::TimeDelta timestamp =
+ base::TimeDelta::FromSeconds(buffer.timestamp.tv_sec) +
+ base::TimeDelta::FromMicroseconds(buffer.timestamp.tv_usec);
client_->OnIncomingCapturedData(
buffer_tracker->start(), buffer_tracker->payload_size(),
- capture_format_, rotation_, base::TimeTicks::Now());
+ capture_format_, rotation_, base::TimeTicks::Now(), timestamp);
if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_QBUF, &buffer)) < 0) {
SetErrorState(FROM_HERE, "Failed to enqueue capture buffer");
« no previous file with comments | « media/capture/video/file_video_capture_device.cc ('k') | media/capture/video/mac/video_capture_device_decklink_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698