media/video/capture/android/video_capture_device_android.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: media/video/capture/android/video_capture_device_android.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

Index: media/video/capture/android/video_capture_device_android.cc

diff --git a/media/video/capture/android/video_capture_device_android.cc b/media/video/capture/android/video_capture_device_android.cc

index d4d7350779819df3845ba3e31f94c71d39735c29..152cfda08756a0c48ac217be9032789306f4ba35 100644

--- a/media/video/capture/android/video_capture_device_android.cc

+++ b/media/video/capture/android/video_capture_device_android.cc

@@ -151,7 +151,7 @@ void VideoCaptureDeviceAndroid::Allocate(

Java_VideoCapture_queryHeight(env, j_capture_.obj());

current_settings_.frame_rate =

Java_VideoCapture_queryFrameRate(env, j_capture_.obj());

- current_settings_.color = VideoCaptureCapability::kYV12;

+ current_settings_.color = PIXEL_FORMAT_YV12;

CHECK(current_settings_.width > 0 && !(current_settings_.width % 2));

CHECK(current_settings_.height > 0 && !(current_settings_.height % 2));

« no previous file with comments | « media/media.gyp ('k') | media/video/capture/fake_video_capture_device.cc » ('j') | no next file with comments »