From bc18fc07beb3909c632cc4dbb73370fb5ec2062b Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Wed, 14 Sep 2016 05:36:20 -0700
Subject: [PATCH] Change onCameraOpening to take camera name as a parameter
 instead of camera id.

Camera id doesn't really exist for Camera2. Changing onCameraOpening to
take a string instead removes ugly code.

BUG=webrtc:6325
R=magjed@webrtc.org

Review-Url: https://codereview.webrtc.org/2331013002
Cr-Commit-Position: refs/heads/master@{#14212}
---
 .../api/android/java/src/org/webrtc/Camera2Session.java   | 8 +-------
 .../api/android/java/src/org/webrtc/CameraCapturer.java   | 2 +-
 .../android/java/src/org/webrtc/CameraVideoCapturer.java  | 2 +-
 .../android/java/src/org/webrtc/VideoCapturerAndroid.java | 2 +-
 .../src/org/webrtc/CameraVideoCapturerTestFixtures.java   | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/webrtc/api/android/java/src/org/webrtc/Camera2Session.java b/webrtc/api/android/java/src/org/webrtc/Camera2Session.java
index f03bcaaed3..a10ce8f538 100644
--- a/webrtc/api/android/java/src/org/webrtc/Camera2Session.java
+++ b/webrtc/api/android/java/src/org/webrtc/Camera2Session.java
@@ -316,13 +316,7 @@ public class Camera2Session implements CameraSession {
     checkIsOnCameraThread();
 
     Logging.d(TAG, "Opening camera " + cameraId);
-    int cameraIndex = -1;
-    try {
-      cameraIndex = Integer.parseInt(cameraId);
-    } catch (NumberFormatException e) {
-      Logging.d(TAG, "External camera with non-int identifier: " + cameraId);
-    }
-    eventsHandler.onCameraOpening(cameraIndex);
+    eventsHandler.onCameraOpening(cameraId);
 
     try {
       cameraManager.openCamera(cameraId, new CameraStateCallback(), cameraThreadHandler);
diff --git a/webrtc/api/android/java/src/org/webrtc/CameraCapturer.java b/webrtc/api/android/java/src/org/webrtc/CameraCapturer.java
index b2fc4a8140..8724da0785 100644
--- a/webrtc/api/android/java/src/org/webrtc/CameraCapturer.java
+++ b/webrtc/api/android/java/src/org/webrtc/CameraCapturer.java
@@ -121,7 +121,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
         @Override
         public void onCameraFreezed(String errorDescription) {}
         @Override
-        public void onCameraOpening(int cameraId) {}
+        public void onCameraOpening(String cameraName) {}
         @Override
         public void onFirstFrameAvailable() {}
         @Override
diff --git a/webrtc/api/android/java/src/org/webrtc/CameraVideoCapturer.java b/webrtc/api/android/java/src/org/webrtc/CameraVideoCapturer.java
index 46432d4619..43513055fa 100644
--- a/webrtc/api/android/java/src/org/webrtc/CameraVideoCapturer.java
+++ b/webrtc/api/android/java/src/org/webrtc/CameraVideoCapturer.java
@@ -29,7 +29,7 @@ public interface CameraVideoCapturer extends VideoCapturer {
     void onCameraFreezed(String errorDescription);
 
     // Callback invoked when camera is opening.
-    void onCameraOpening(int cameraId);
+    void onCameraOpening(String cameraName);
 
     // Callback invoked when first camera frame is available after camera is started.
     void onFirstFrameAvailable();
diff --git a/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java
index 8f4fce7fe3..990563adca 100644
--- a/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java
@@ -323,7 +323,7 @@ public class VideoCapturerAndroid implements
         synchronized (cameraIdLock) {
           Logging.d(TAG, "Opening camera " + id);
           if (eventsHandler != null) {
-            eventsHandler.onCameraOpening(id);
+            eventsHandler.onCameraOpening(Camera1Enumerator.getDeviceName(id));
           }
           camera = android.hardware.Camera.open(id);
           info = new android.hardware.Camera.CameraInfo();
diff --git a/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java b/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
index c8c2907628..3c38228097 100644
--- a/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
+++ b/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
@@ -209,7 +209,7 @@ class CameraVideoCapturerTestFixtures {
     }
 
     @Override
-    public void onCameraOpening(int cameraId) {
+    public void onCameraOpening(String cameraName) {
       onCameraOpeningCalled = true;
       synchronized (cameraClosedLock) {
         cameraClosed = false;