Fix access to multi front/back cameras on Android devices

Allow to access second (and more) front or back cameras on Android
devices by adding a counter number at the end of additional camera name
and description (don't need to brake current code compatibility or
confuse majority of the users with only one front/back cameras on their
devices)

Fixes: QTBUG-59726
Change-Id: Icecb3af7521d4bbd3fbb0b953895c045cfdbf60a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 633597b00423adf8359763bc14d185e3ca91efbe)
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
index c257caeae..757fbeb30 100644
--- a/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
@@ -836,6 +836,12 @@ void AndroidCamera::getCameraInfo(int id, QCameraDevicePrivate *info)
     default:
         break;
     }
+    // Add a number to allow correct access to cameras on systems with two
+    // (and more) front/back cameras
+    if (id > 1) {
+        info->id.append(QByteArray::number(id));
+        info->description.append(QString(" %1").arg(id));
+    }
 }
 
 QVideoFrameFormat::PixelFormat AndroidCamera::QtPixelFormatFromAndroidImageFormat(AndroidCamera::ImageFormat format)