Move NV21 colorspace treatment from VideoCapture java to C++

media/video/capture/android/video_capture_device_android.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
 #define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 
@@ skipping 35 matching lines @@
       jboolean flip_horiz);
 
  private:
   enum InternalState {
     kIdle,  // The device is opened but not in use.
     kAllocated,  // All resouces have been allocated and camera can be started.
     kCapturing,  // Video is being captured.
     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
+  };

[wjia(left Chromium), 2013/09/18 18:35:27]

This enum should be moved into cc file.

+
   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
   // accessed from different threads.
   base::Lock lock_;
   InternalState state_;
   VideoCaptureDevice::EventHandler* observer_;
 
   Name device_name_;
   VideoCaptureCapability current_settings_;
 
   // Java VideoCaptureAndroid instance.
   base::android::ScopedJavaGlobalRef<jobject> j_capture_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_