| 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 635417af57258b66b3906acf0ca005a0615c6631..4a59b8b3f0085f33c09b0600b3376124da4de73e 100644
|
| --- a/media/video/capture/android/video_capture_device_android.h
|
| +++ b/media/video/capture/android/video_capture_device_android.h
|
| @@ -23,6 +23,13 @@ namespace media {
|
| // but only VideoCaptureManager would change their value.
|
| class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
|
| public:
|
| + // 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
|
| + };
|
| +
|
| virtual ~VideoCaptureDeviceAndroid();
|
|
|
| static VideoCaptureDevice* Create(const Name& device_name);
|
| @@ -48,13 +55,6 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
|
| 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
|
| - };
|
| -
|
| explicit VideoCaptureDeviceAndroid(const Name& device_name);
|
| bool Init();
|
| VideoPixelFormat GetColorspace();
|
|
|