media/video/capture/android/video_capture_device_android.h - Issue 23903032: Move NV21 colorspace treatment from VideoCapture java to C++

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.h

Issue 23903032: Move NV21 colorspace treatment from VideoCapture java to C++ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added ImageFormat.java automatic generation to android_webview/Android.mk, missed before. 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

« media/base/android/java/src/org/chromium/media/VideoCapture.java ('K') | « media/video/capture/android/imageformat_list.h ('k') | media/video/capture/android/video_capture_device_android.cc » ('j') | media/video/capture/android/video_capture_device_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 297a66dc0cdda64b815a4e38dcd51629d8cbf5df..20966549fe2d18dead2e1392c01e7c54bd5dde67 100644

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

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

@@ -53,8 +53,16 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice1 {

kError // Hit error. User needs to recover by destroying the object.

};

+ // Automatically generated enum to interface with Java world.

+ enum AndroidImageFormat {

+#define DEFINE_ANDROID_IMAGEFORMAT(name, value) name = value,

+#include "media/video/capture/android/imageformat_list.h"

+#undef DEFINE_ANDROID_IMAGEFORMAT

+ };

wjia(left Chromium) 2013/09/18 18:35:27 This enum should be moved into cc file.

explicit VideoCaptureDeviceAndroid(const Name& device_name);

bool Init();

+ VideoPixelFormat GetColorspace();

void SetErrorState(const std::string& reason);

// Prevent racing on accessing |state_| and |observer_| since both could be