diff options
| author | Andrey Yaromenok <ayaromenok@gmail.com> | 2017-04-14 09:22:37 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-12-16 13:05:23 +0100 |
| commit | cca3d6e4a263f57672928ec1e63ec5a74250ef33 (patch) | |
| tree | 4b04a701b88465834fc38c53a78e14fe0c525872 | |
| parent | 569d91d8560620d697dd8cc7c49581c7ff70b8ce (diff) | |
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>
| -rw-r--r-- | src/plugins/android/src/wrappers/jni/androidcamera.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp index 9f56ac437..fc05ad6fb 100644 --- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp +++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp @@ -797,6 +797,12 @@ void AndroidCamera::getCameraInfo(int id, AndroidCameraInfo *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->name.append(QByteArray::number(id)); + info->description.append(QString(" %1").arg(id)); + } } void AndroidCamera::startPreview() |