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

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

Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix a namespace issue Created 8 years, 8 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
« no previous file with comments | « media/video/capture/mac/video_capture_device_mac.mm ('k') | media/video/capture/video_capture_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/mac/video_capture_device_qtkit_mac.mm
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 efbee0fd08a36ac19dc42a74155fb423bc30f5f1..46205b6ea1ef14c3a0dfbb71db04f9e1148d4c2d 100644
--- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm
+++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "media/video/capture/mac/video_capture_device_mac.h"
#include "media/video/capture/video_capture_device.h"
+#include "media/video/capture/video_capture_types.h"
@implementation VideoCaptureDeviceQTKit
@@ -159,11 +160,13 @@
size_t bytesPerRow = CVPixelBufferGetBytesPerRow(videoFrame);
int frameHeight = CVPixelBufferGetHeight(videoFrame);
int frameSize = bytesPerRow * frameHeight;
- media::VideoCaptureDevice::Capability captureCapability;
+ media::VideoCaptureCapability captureCapability;
captureCapability.width = frameWidth_;
captureCapability.height = frameHeight_;
captureCapability.frame_rate = frameRate_;
- captureCapability.color = media::VideoCaptureDevice::kARGB;
+ captureCapability.color = media::VideoCaptureCapability::kARGB;
+ captureCapability.expected_capture_delay = 0;
+ captureCapability.interlaced = false;
// Deliver the captured video frame.
frameReceiver_->ReceiveFrame(static_cast<UInt8*>(baseAddress), frameSize,
« no previous file with comments | « media/video/capture/mac/video_capture_device_mac.mm ('k') | media/video/capture/video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698