Android Video Capture: Added static methods for device & capabilities enumeration using Camera2 API

media/video/capture/android/video_capture_device_factory_android.cc

 // Copyright 2014 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_factory_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"
@@ skipping 40 matching lines @@
   return scoped_ptr<VideoCaptureDevice>();
 }
 
 void VideoCaptureDeviceFactoryAndroid::GetDeviceNames(
     VideoCaptureDevice::Names* device_names) {
   DCHECK(thread_checker_.CalledOnValidThread());
   device_names->clear();
 
   JNIEnv* env = AttachCurrentThread();
 
-  int num_cameras = Java_VideoCaptureFactory_getNumberOfCameras(
-      env, base::android::GetApplicationContext());
+  const jobject context = base::android::GetApplicationContext();
+  const int num_cameras = Java_VideoCaptureFactory_getNumberOfCameras(env,
+                                                                      context);
   DVLOG(1) << "VideoCaptureDevice::GetDeviceNames: num_cameras=" << num_cameras;
   if (num_cameras <= 0)
     return;
 
   for (int camera_id = num_cameras - 1; camera_id >= 0; --camera_id) {
     base::android::ScopedJavaLocalRef<jstring> device_name =
-        Java_VideoCaptureFactory_getDeviceName(env, camera_id);
+        Java_VideoCaptureFactory_getDeviceName(env, camera_id, context);
     if (device_name.obj() == NULL)
       continue;
 
     VideoCaptureDevice::Name name(
         base::android::ConvertJavaStringToUTF8(device_name),
         base::IntToString(camera_id));
     device_names->push_back(name);
 
     DVLOG(1) << "VideoCaptureDeviceFactoryAndroid::GetDeviceNames: camera "
              << "device_name=" << name.name() << ", unique_id=" << name.id();
   }
 }
 
 void VideoCaptureDeviceFactoryAndroid::GetDeviceSupportedFormats(
     const VideoCaptureDevice::Name& device,
     VideoCaptureFormats* capture_formats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   int id;
   if (!base::StringToInt(device.id(), &id))
     return;
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobjectArray> collected_formats =
-      Java_VideoCaptureFactory_getDeviceSupportedFormats(env, id);
+      Java_VideoCaptureFactory_getDeviceSupportedFormats(env,
+          base::android::GetApplicationContext(), id);
   if (collected_formats.is_null())
     return;
 
   jsize num_formats = env->GetArrayLength(collected_formats.obj());
   for (int i = 0; i < num_formats; ++i) {
     base::android::ScopedJavaLocalRef<jobject> format(
         env, env->GetObjectArrayElement(collected_formats.obj(), i));
 
     VideoPixelFormat pixel_format = media::PIXEL_FORMAT_UNKNOWN;
     switch (media::Java_VideoCaptureFactory_getCaptureFormatPixelFormat(
@@ skipping 14 matching lines @@
                       format.obj())),
         media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env,
                                                                   format.obj()),
         pixel_format);
     capture_formats->push_back(capture_format);
     DVLOG(1) << device.name() << " " << capture_format.ToString();
   }
 }
 
 }  // namespace media