Move NV21 colorspace treatment from VideoCapture java to C++

media/video/capture/android/video_capture_device_android.cc

 // 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.
 
 #include "media/video/capture/android/video_capture_device_android.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "jni/VideoCapture_jni.h"
 #include "media/base/video_util.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::GetClass;
 using base::android::MethodID;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
-namespace {
-
-int GetIntField(JNIEnv* env,
-                const JavaRef<jclass>& clazz,
-                const JavaRef<jobject>& instance,
-                const char* field_name) {
-  jfieldID field = GetFieldID(env, clazz, field_name, "I");
-  jint int_value = env->GetIntField(instance.obj(), field);
-  return int_value;
-}
-
-}  // namespace
-
 namespace media {
 
 // static
 void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
   device_names->clear();
 
   JNIEnv* env = AttachCurrentThread();
 
   int num_cameras = Java_ChromiumCameraInfo_getNumberOfCameras(env);
   DVLOG(1) << "VideoCaptureDevice::GetDeviceNames: num_cameras=" << num_cameras;
@@ skipping 97 matching lines @@
     return;
   }
 
   // Store current width and height.
   current_settings_.width =
       Java_VideoCapture_queryWidth(env, j_capture_.obj());
   current_settings_.height =
       Java_VideoCapture_queryHeight(env, j_capture_.obj());
   current_settings_.frame_rate =
       Java_VideoCapture_queryFrameRate(env, j_capture_.obj());
-  current_settings_.color = PIXEL_FORMAT_YV12;
+  current_settings_.color = GetColorspace();
+  DCHECK_NE(current_settings_.color, media::PIXEL_FORMAT_UNKNOWN);
   CHECK(current_settings_.width > 0 && !(current_settings_.width % 2));
   CHECK(current_settings_.height > 0 && !(current_settings_.height % 2));
 
   DVLOG(1) << "VideoCaptureDeviceAndroid::Allocate: queried width="
            << current_settings_.width
            << ", height="
            << current_settings_.height
            << ", frame_rate="
            << current_settings_.frame_rate;
   // Report the frame size to the observer.
@@ skipping 84 matching lines @@
     return;
   }
 
   observer_->OnIncomingCapturedFrame(
       reinterpret_cast<uint8*>(buffer), length, base::Time::Now(),
       rotation, flip_vert, flip_horiz);
 
   env->ReleaseByteArrayElements(data, buffer, JNI_ABORT);
 }
 
+VideoPixelFormat VideoCaptureDeviceAndroid::GetColorspace() {
+  JNIEnv* env = AttachCurrentThread();
+  int current_capture_colorspace =
+      Java_VideoCapture_getColorspace(env, j_capture_.obj());
+  switch (current_capture_colorspace){
+  case ANDROID_IMAGEFORMAT_YV12:
+    return media::PIXEL_FORMAT_YV12;
+  case ANDROID_IMAGEFORMAT_NV21:
+    return media::PIXEL_FORMAT_NV21;
+  case ANDROID_IMAGEFORMAT_YUY2:
+    return media::PIXEL_FORMAT_YUY2;
+  case ANDROID_IMAGEFORMAT_NV16:
+  case ANDROID_IMAGEFORMAT_JPEG:
+  case ANDROID_IMAGEFORMAT_RGB_565:
+  case ANDROID_IMAGEFORMAT_UNKNOWN:
+      // NOTE(mcasas): NV16, JPEG, RGB565 not supported in VideoFormatPixel.

[Ami GONE FROM CHROMIUM, 2013/09/12 17:03:16]

indent is strange :)

[mcasas, 2013/09/16 08:43:02]

Done.

+  default:

[Ami GONE FROM CHROMIUM, 2013/09/12 17:03:16]

omitting the default case will let the compiler warn future developers who
extend the enum but forget to update this code.

[mcasas, 2013/09/16 08:43:02]

Problem is: is not an enum :( but an integer; we need to add the default and
trust the (future) developers to do the "right thing" (TM).

+    return media::PIXEL_FORMAT_UNKNOWN;
+  }
+}
+
 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) {
   LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason;
   {
     base::AutoLock lock(lock_);
     state_ = kError;
   }
   observer_->OnError();
 }
 
 }  // namespace media