content/browser/renderer_host/media/web_contents_video_capture_device.cc - 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: content/browser/renderer_host/media/web_contents_video_capture_device.cc

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 | « content/browser/renderer_host/media/video_capture_manager_unittest.cc ('k') | content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/web_contents_video_capture_device.cc

diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc

index 2788bb228f62ad34d3779da31269681b440072dd..b807d83c54df6c15bb00a032d3591b2eee6363f3 100644

--- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc

+++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc

@@ -1076,7 +1076,7 @@ void WebContentsVideoCaptureDevice::Impl::Allocate(

settings.frame_rate = frame_rate;

// Note: the value of |settings.color| doesn't matter if we use only the

// VideoFrame based methods on |consumer|.

- settings.color = media::VideoCaptureCapability::kI420;

+ settings.color = media::PIXEL_FORMAT_I420;

settings.expected_capture_delay = 0;

settings.interlaced = false;