media/video/capture/mac/video_capture_device_qtkit_mac.mm - Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

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/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: rebased code and addressed scherkus's comments 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

« content/browser/renderer_host/media/media_stream_device_settings.h ('K') | « media/video/capture/mac/video_capture_device_mac.mm ('k') | media/video/capture/video_capture_device.h » ('j') | media/video/capture/win/sink_input_pin_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..8813195f6a21f003782bbd348d2dfb4376289854 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;

+ VideoCaptureCapability captureCapability;

captureCapability.width = frameWidth_;

captureCapability.height = frameHeight_;

captureCapability.frame_rate = frameRate_;

- captureCapability.color = media::VideoCaptureDevice::kARGB;

+ captureCapability.color = VideoCaptureCapability::kARGB;

+ captureCapability.expected_capture_delay = 0;

+ captureCapability.interlaced = false;

// Deliver the captured video frame.

frameReceiver_->ReceiveFrame(static_cast<UInt8*>(baseAddress), frameSize,