Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / media / video / capture / android / video_capture_device_android.h

diff --git a/src/media/video/capture/android/video_capture_device_android.h b/src/media/video/capture/android/video_capture_device_android.h
index 635417a..4a59b8b 100644 (file)
--- a/src/media/video/capture/android/video_capture_device_android.h
+++ b/src/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();