Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1118)

Unified Diff: media/video/capture/android/video_capture_device_android.h

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/media.gyp ('k') | media/video/capture/android/video_capture_device_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 f3a2e933e96912d97296c84ab8f93e029212062f..e4defa1bab414b369db2791db8100680557b268d 100644
--- a/media/video/capture/android/video_capture_device_android.h
+++ b/media/video/capture/android/video_capture_device_android.h
@@ -24,10 +24,15 @@ namespace media {
class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
public:
// Automatically generated enum to interface with Java world.
+ //
+ // A Java counterpart will be generated for this enum.
+ // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media
enum AndroidImageFormat {
-#define DEFINE_ANDROID_IMAGEFORMAT(name, value) name = value,
-#include "media/video/capture/android/imageformat_list.h"
-#undef DEFINE_ANDROID_IMAGEFORMAT
+ // Android graphics ImageFormat mapping, see reference in:
+ // http://developer.android.com/reference/android/graphics/ImageFormat.html
+ ANDROID_IMAGE_FORMAT_NV21 = 17,
+ ANDROID_IMAGE_FORMAT_YV12 = 842094169,
+ ANDROID_IMAGE_FORMAT_UNKNOWN = 0,
};
explicit VideoCaptureDeviceAndroid(const Name& device_name);
« no previous file with comments | « media/media.gyp ('k') | media/video/capture/android/video_capture_device_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698