Update To 11.40.268.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 1a2e8b8..e4defa1 100644 (file)
--- a/src/media/video/capture/android/video_capture_device_android.h
+++ b/src/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);
@@ -43,8 +48,8 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
 
   // VideoCaptureDevice implementation.
   virtual void AllocateAndStart(const VideoCaptureParams& params,
-                                scoped_ptr<Client> client) OVERRIDE;
-  virtual void StopAndDeAllocate() OVERRIDE;
+                                scoped_ptr<Client> client) override;
+  virtual void StopAndDeAllocate() override;
 
   // Implement org.chromium.media.VideoCapture.nativeOnFrameAvailable.
   void OnFrameAvailable(