diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2023-08-07 19:31:21 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-11 16:30:36 +0000 |
| commit | dc55e7cddf89d170eb02084c8c5a4eb53feb8ad4 (patch) | |
| tree | b862072d1039a6d8e5a1714e478a812da35b0757 | |
| parent | a48ea75b5174003d07f7f8e8020230c3b068e421 (diff) | |
Android: Clear supported flash modes on FFmpeg-backend
When updating Camera Characteristics, we should first clear current list
of supported flash modes.
Fixes: QTBUG-115843
Change-Id: I25adbd82612100080e189e93097f0132496cddb0
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 7ad75617eab2e3e6b6a2b4143ea15cdba9035bc9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qandroidcamera.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qandroidcamera.cpp b/src/plugins/multimedia/ffmpeg/qandroidcamera.cpp index 78e2dd073..0e5feae6c 100644 --- a/src/plugins/multimedia/ffmpeg/qandroidcamera.cpp +++ b/src/plugins/multimedia/ffmpeg/qandroidcamera.cpp @@ -363,6 +363,7 @@ void QAndroidCamera::updateCameraCharacteristics() m_TorchModeSupported = deviceManager.callMethod<jboolean>( "isTorchModeSupported", QJniObject::fromString(m_cameraDevice.id()).object<jstring>()); + m_supportedFlashModes.clear(); m_supportedFlashModes.append(QCamera::FlashOff); QJniObject flashModesObj = deviceManager.callMethod<QtJniTypes::StringArray>( "getSupportedFlashModes", @@ -392,6 +393,7 @@ void QAndroidCamera::cleanCameraCharacteristics() setFlashMode(QCamera::FlashOff); } m_supportedFlashModes.clear(); + m_supportedFlashModes.append(QCamera::FlashOff); } void QAndroidCamera::setFlashMode(QCamera::FlashMode mode) |