media/capture/video/mac/video_capture_device_mac.mm - Issue 1421583007: Mac Video Capture: Sending the timestamps provided by the driver to the capture pipeline

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/capture/video/mac/video_capture_device_mac.mm

Issue 1421583007: Mac Video Capture: Sending the timestamps provided by the driver to the capture pipeline (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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

« media/capture/video/mac/video_capture_device_avfoundation_mac.mm ('K') | « media/capture/video/mac/video_capture_device_mac.h ('k') | media/capture/video/mac/video_capture_device_qtkit_mac.mm » ('j') | media/capture/video/mac/video_capture_device_qtkit_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/mac/video_capture_device_mac.mm

diff --git a/media/capture/video/mac/video_capture_device_mac.mm b/media/capture/video/mac/video_capture_device_mac.mm

index 5fc083e4d68169482e2c329d43ebbebcce1a7d83..a598988f9733defdf7a12a3851f274db45e9b3ce 100644

--- a/media/capture/video/mac/video_capture_device_mac.mm

+++ b/media/capture/video/mac/video_capture_device_mac.mm

@@ -464,7 +464,8 @@ void VideoCaptureDeviceMac::ReceiveFrame(const uint8* video_frame,

int video_frame_length,

const VideoCaptureFormat& frame_format,

int aspect_numerator,

- int aspect_denominator) {

+ int aspect_denominator,

+ base::TimeTicks timestamp) {

// This method is safe to call from a device capture thread, i.e. any thread

// controlled by QTKit/AVFoundation.

if (!final_resolution_selected_) {

@@ -536,7 +537,7 @@ void VideoCaptureDeviceMac::ReceiveFrame(const uint8* video_frame,

}

client_->OnIncomingCapturedData(video_frame, video_frame_length, frame_format,

- 0, base::TimeTicks::Now());

+ 0, timestamp);

}

void VideoCaptureDeviceMac::ReceiveError(const std::string& reason) {