Merge ~abreu-alexandre/oxide:video-capture-name-fix into oxide:master

[Alexandre Abreu]

Fix video capture device name used internally to determine the facing/position

Fix video capture device name used internally to determine the facing/position

[Chris Coulson (chrisccoulson)]

Thanks, I've left some comments inline

review: Needs Fixing

78fffe5... by Alexandre Abreu on 2016-07-05

Fix video capture device name used internally to determine the facing/position

[Alexandre Abreu (abreu-alexandre)]

updated,

[Chris Coulson (chrisccoulson)]

Almost there - just a few remaining / additional style issues, and a runtime check is needed too.

review: Needs Fixing

7d07eda... by Alexandre Abreu on 2016-07-08

Fix spacing; make sure that hybris prefix is there when enumerating camera device ids

[Alexandre Abreu (abreu-alexandre)]

updated

[Chris Coulson (chrisccoulson)]

It looks ok now, bar one small nit

review: Approve

diff --git a/qt/quick/api/oxideqquickglobal.cc b/qt/quick/api/oxideqquickglobal.cc
index 0c4d825..97681c0 100644
--- a/qt/quick/api/oxideqquickglobal.cc
+++ b/qt/quick/api/oxideqquickglobal.cc
@@ -43,8 +43,10 @@ QVariant VideoCaptureDeviceToVariant(const OxideQVideoCaptureDevice& device) {
   switch (device.position()) {
     case OxideQVideoCaptureDevice::PositionFrontFace:
       rv["position"] = "frontface";
+      break;
     case OxideQVideoCaptureDevice::PositionBackFace:
       rv["position"] = "backface";
+      break;
     default:
       rv["position"] = "unspecified";
   }
diff --git a/shared/browser/media/oxide_media_capture_devices_dispatcher.cc b/shared/browser/media/oxide_media_capture_devices_dispatcher.cc
index 0fb4f1e..79c9cae 100644
--- a/shared/browser/media/oxide_media_capture_devices_dispatcher.cc
+++ b/shared/browser/media/oxide_media_capture_devices_dispatcher.cc
@@ -17,6 +17,10 @@
 
 #include "oxide_media_capture_devices_dispatcher.h"
 
+#if defined(ENABLE_HYBRIS_CAMERA)
+#include <hybris/camera/camera_compatibility_layer_capabilities.h>
+#endif
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ -29,6 +33,9 @@
 
 #include "shared/browser/oxide_browser_context.h"
 #include "shared/browser/oxide_browser_process_main.h"
+#if defined(ENABLE_HYBRIS_CAMERA)
+#include "shared/browser/oxide_hybris_utils.h"
+#endif
 #include "shared/browser/permissions/oxide_permission_request_dispatcher.h"
 #include "shared/browser/permissions/oxide_permission_request_response.h"
 #include "shared/browser/permissions/oxide_temporary_saved_permission_context.h"
@@ -36,6 +43,10 @@
 #include "oxide_media_capture_devices_context.h"
 #include "oxide_media_capture_devices_dispatcher_observer.h"
 
+#if defined(ENABLE_HYBRIS_CAMERA)
+#include "oxide_video_capture_device_hybris.h"
+#endif
+
 namespace oxide {
 
 namespace {
@@ -197,6 +208,47 @@ PermissionRequestCallback WrapMediaResponseCallback(
                     embedding_origin);
 }
 
+void UpdateMediaStreamDeviceFacing(
+    content::MediaStreamDevices & devices) {
+#ifdef ENABLE_HYBRIS_CAMERA
+  if (!HybrisUtils::IsCameraCompatAvailable()) {
+    return;
+  }
+
+  for (auto& device : devices) {
+    if (device.id.find(
+          VideoCaptureDeviceHybris::GetDeviceIdPrefix()) != 0) {
+      continue;
+    }
+
+    int32_t camera_id =
+        oxide::VideoCaptureDeviceHybris::GetCameraIdfromDeviceId(
+            device.id);
+
+    CameraType type;
+    int orientation;
+    if (android_camera_get_device_info(camera_id,
+                                       reinterpret_cast<int*>(&type),
+                                       &orientation) != 0) {
+      LOG(ERROR) << "Failed to get device info for camera with ID "
+                 << camera_id;
+      continue;
+    }
+
+    switch(type) {
+      case BACK_FACING_CAMERA_TYPE:
+        device.video_facing = content::MEDIA_VIDEO_FACING_ENVIRONMENT;
+        break;
+      case FRONT_FACING_CAMERA_TYPE:
+        device.video_facing = content::MEDIA_VIDEO_FACING_USER;
+        break;
+      default:
+        break;
+    }
+  }
+#endif
+}
+
 }
 
 MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() {}
@@ -237,6 +289,11 @@ void MediaCaptureDevicesDispatcher::OnAudioCaptureDevicesChanged() {
 }
 
 void MediaCaptureDevicesDispatcher::OnVideoCaptureDevicesChanged() {
+  current_video_capture_devices_ =
+      content::MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
+
+  UpdateMediaStreamDeviceFacing(current_video_capture_devices_);
+
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
@@ -290,7 +347,14 @@ MediaCaptureDevicesDispatcher::GetVideoCaptureDevices() {
     return EmptyDevices();
   }
 
-  return content::MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
+  if (current_video_capture_devices_.empty()) {
+    current_video_capture_devices_ =
+        content::MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
+
+    UpdateMediaStreamDeviceFacing(current_video_capture_devices_);
+  }
+
+  return current_video_capture_devices_;
 }
 
 const content::MediaStreamDevice*
diff --git a/shared/browser/media/oxide_media_capture_devices_dispatcher.h b/shared/browser/media/oxide_media_capture_devices_dispatcher.h
index 6551fc3..700991d 100644
--- a/shared/browser/media/oxide_media_capture_devices_dispatcher.h
+++ b/shared/browser/media/oxide_media_capture_devices_dispatcher.h
@@ -117,6 +117,8 @@ class OXIDE_SHARED_EXPORT MediaCaptureDevicesDispatcher
 
   base::ObserverList<MediaCaptureDevicesDispatcherObserver> observers_;
 
+  content::MediaStreamDevices current_video_capture_devices_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
 };
 
diff --git a/shared/browser/media/oxide_video_capture_device_hybris.cc b/shared/browser/media/oxide_video_capture_device_hybris.cc
index bfd23f4..0d9264a 100644
--- a/shared/browser/media/oxide_video_capture_device_hybris.cc
+++ b/shared/browser/media/oxide_video_capture_device_hybris.cc
@@ -43,18 +43,6 @@ namespace {
 
 void DummyOnPreviewTextureNeedsUpdateCallback(void* context) {}
 
-int32_t GetCameraId(const media::VideoCaptureDevice::Name& device_name) {
-  std::string device_id_format =
-      base::StringPrintf("%s%%d",
-                         VideoCaptureDeviceHybris::GetDeviceIdPrefix());
-  int32_t camera_id = -1;
-  int rv =
-      sscanf(device_name.id().c_str(), device_id_format.c_str(), &camera_id);
-  CHECK_EQ(rv, 1);
-
-  return camera_id;
-}
-
 int GetRotation(CameraType position, int orientation) {
   int display_rotation =
       BrowserPlatformIntegration::GetInstance()
@@ -80,6 +68,21 @@ int GetRotation(CameraType position, int orientation) {
 }
 
 // static
+int32_t VideoCaptureDeviceHybris::GetCameraIdfromDeviceId(
+    const std::string& device_id) {
+  std::string device_id_format =
+      base::StringPrintf("%s%%d",
+                         VideoCaptureDeviceHybris::GetDeviceIdPrefix());
+
+  int32_t camera_id = -1;
+  int rv =
+      sscanf(device_id.c_str(), device_id_format.c_str(), &camera_id);
+  CHECK_EQ(rv, 1);
+
+  return camera_id;
+}
+
+// static
 void VideoCaptureDeviceHybris::OnMsgErrorCallback(void* context) {
   reinterpret_cast<VideoCaptureDeviceHybris*>(context)->OnError();
 }
@@ -137,7 +140,7 @@ void VideoCaptureDeviceHybris::AllocateAndStart(
       &DummyOnPreviewTextureNeedsUpdateCallback;
   listener_->on_preview_frame_cb = &OnPreviewFrameCallback;
 
-  int32_t camera_id = GetCameraId(device_name_);
+  int32_t camera_id = GetCameraIdfromDeviceId(device_name_.id());
 
   if (android_camera_get_device_info(camera_id,
                                      reinterpret_cast<int*>(&position_),
diff --git a/shared/browser/media/oxide_video_capture_device_hybris.h b/shared/browser/media/oxide_video_capture_device_hybris.h
index ba9280f..fb76f59 100644
--- a/shared/browser/media/oxide_video_capture_device_hybris.h
+++ b/shared/browser/media/oxide_video_capture_device_hybris.h
@@ -47,6 +47,7 @@ class VideoCaptureDeviceHybris : public media::VideoCaptureDevice {
   ~VideoCaptureDeviceHybris() override;
 
   static const char* GetDeviceIdPrefix();
+  static int32_t GetCameraIdfromDeviceId(const std::string& device_id);
 
  private:
   static void OnMsgErrorCallback(void* context);