diff options
| author | Andrey Yaromenok <ayaromenok@gmail.com> | 2022-12-16 10:47:19 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-12-16 11:27:15 +0100 |
| commit | 633597b00423adf8359763bc14d185e3ca91efbe (patch) | |
| tree | b344cf711bf783a679ec1fe1c730c148002ca62e /src/plugins | |
| parent | d8e22e3fa321560bed48089a5445edba9cfc535c (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
Pick-to: 6.5 6.4 6.2
Change-Id: Icecb3af7521d4bbd3fbb0b953895c045cfdbf60a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp b/src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp index 20d05c4c5..7ea626fa9 100644 --- a/src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp +++ b/src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp @@ -801,6 +801,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) |