media/video/capture/android/video_capture_device_android.cc - Issue 659493003: Final step of the java_cpp_template -> java_cpp_enum migration.

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 659493003: Final step of the java_cpp_template -> java_cpp_enum migration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 2 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/android/video_capture_device_android.h ('k') | media/video/capture/android/video_capture_device_factory_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3817e53af8eeec0fb147ca78972c596b8ba3faa9..836153df749132fb780aa92be72f5a76b0b935d6 100644

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

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

@@ -179,11 +179,11 @@ VideoPixelFormat VideoCaptureDeviceAndroid::GetColorspace() {

int current_capture_colorspace =

Java_VideoCapture_getColorspace(env, j_capture_.obj());

switch (current_capture_colorspace) {

- case ANDROID_IMAGEFORMAT_YV12:

+ case ANDROID_IMAGE_FORMAT_YV12:

return media::PIXEL_FORMAT_YV12;

- case ANDROID_IMAGEFORMAT_NV21:

+ case ANDROID_IMAGE_FORMAT_NV21:

return media::PIXEL_FORMAT_NV21;

- case ANDROID_IMAGEFORMAT_UNKNOWN:

+ case ANDROID_IMAGE_FORMAT_UNKNOWN:

default:

return media::PIXEL_FORMAT_UNKNOWN;

}