media/video/capture/mac/video_capture_device_mac.mm - Issue 22876027: Consolidate duplicated frame / capability structures in video_capture_types.h

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_mac.mm

Issue 22876027: Consolidate duplicated frame / capability structures in video_capture_types.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased: changed media::VideoCaptureCapability::kI420 -> media::PIXEL_FORMAT_I420 etc. Created 7 years, 3 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/linux/video_capture_device_linux.cc ('k') | media/video/capture/mac/video_capture_device_qtkit_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 957486e8059251f305d88fe65d086aab94ea1088..11dde73cc0d470b74da750629bcd111b8a7918dd 100644

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

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

@@ -149,7 +149,7 @@ void VideoCaptureDeviceMac::Allocate(

state_ = kAllocated;

VideoCaptureCapability current_settings;

- current_settings.color = VideoCaptureCapability::kARGB;

+ current_settings.color = PIXEL_FORMAT_ARGB;

current_settings.width = width;

current_settings.height = height;

current_settings.frame_rate = frame_rate;