summaryrefslogtreecommitdiffstats
path: root/media/video/capture/mac
diff options
context:
space:
mode:
authormcasas <mcasas@chromium.org>2014-10-07 03:21:02 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 10:21:16 +0000
commitea61596ff76f7bdd7e3f7f9681e06a42b18fddbe (patch)
tree76b1196d73a93dac5d7721cc73fa001c54adaad2 /media/video/capture/mac
parentcfe1912bcc70118364c9156e1e12c6c89b1a06b9 (diff)
downloadchromium_src-ea61596ff76f7bdd7e3f7f9681e06a42b18fddbe.zip
chromium_src-ea61596ff76f7bdd7e3f7f9681e06a42b18fddbe.tar.gz
chromium_src-ea61596ff76f7bdd7e3f7f9681e06a42b18fddbe.tar.bz2
Mac Video Capture: Connect discard-late-frames in QTKit and AVFoundation
QTKit QTCaptureDecompressedVideoOutput automaticallyDropsLateVideoFrames is by default NO, should be YES. AVFoundation has a similar AVCaptureVideoDataOutput with a property alwaysDiscardsLateVideoFrames that is allegedly YES, this CL forces it to YES just in case. COLLABORATOR=magjed@chromium.org TBR=dalecurtis@chromium.org (media/base/mac/avfoundation_glue.h) BUG=417237 Review URL: https://codereview.chromium.org/613663004 Cr-Commit-Position: refs/heads/master@{#298437}
Diffstat (limited to 'media/video/capture/mac')
-rw-r--r--media/video/capture/mac/video_capture_device_avfoundation_mac.mm1
-rw-r--r--media/video/capture/mac/video_capture_device_qtkit_mac.mm1
2 files changed, 2 insertions, 0 deletions
diff --git a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm
index 47ae1ef..0501628 100644
--- a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm
+++ b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm
@@ -160,6 +160,7 @@
stringWithUTF8String:"Could not create video data output."]];
return NO;
}
+ [captureVideoDataOutput_ setAlwaysDiscardsLateVideoFrames:true];
[captureVideoDataOutput_
setSampleBufferDelegate:self
queue:dispatch_get_global_queue(
diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.mm b/media/video/capture/mac/video_capture_device_qtkit_mac.mm
index 896a137..09622e4 100644
--- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm
+++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm
@@ -117,6 +117,7 @@
QTCaptureDecompressedVideoOutput *captureDecompressedOutput =
[[[QTCaptureDecompressedVideoOutput alloc] init] autorelease];
[captureDecompressedOutput setDelegate:self];
+ [captureDecompressedOutput setAutomaticallyDropsLateVideoFrames:YES];
if (![captureSession_ addOutput:captureDecompressedOutput error:&error]) {
[self sendErrorString:[NSString
stringWithFormat:@"Could not connect video capture output (%@): %@",