| 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 29a5fc7cf5dea14713ca5cd3c8dc7bba3f4dc43b..6c02f02ef8b690a11b0b52e40713d047b2799bdb 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 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();
|
| void SetErrorState(const std::string& reason);
|
|
|
| // Prevent racing on accessing |state_| and |observer_| since both could be
|
|
|