diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2023-05-10 12:10:07 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-05-11 08:34:52 +0000 |
| commit | ab0bdd7eeacc86a3cf927d3e2a115134555a3a28 (patch) | |
| tree | 4c5c7be63f191e40d1643272ccce4c7e3432dffd | |
| parent | 558b6340a704610f5dcfc76e41cabc3b75cf2a65 (diff) | |
| download | qtmultimedia-ab0bdd7eeacc86a3cf927d3e2a115134555a3a28.tar.gz | |
Android-backend: fix for setting maximumZoomFactor
Before this commit, the maximum zoom factor was set locally in the
QAndroidCamera class. It was not propagated to its base QPlatformCamera
class. That cause the problem with wrong value returned by
maxZoomFactor() method.
This commit contains setting correctly m_maxZoom in QPlatformCamera and
remove not needed m_maximumZoom member from QAndroidCamera.
Fixes: QTBUG-105372
Change-Id: Iaf167d03e42cb0e22ebe60862bb9dc24b1ef9173
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 54464a09a49593ce70065d8481bb32f499348728)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/multimedia/android/mediacapture/qandroidcamera_p.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp b/src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp index cadd72fb6..52d2e00f6 100644 --- a/src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp +++ b/src/plugins/multimedia/android/mediacapture/qandroidcamera.cpp @@ -197,13 +197,11 @@ void QAndroidCamera::onCameraOpened() if (m_cameraSession->camera()->isZoomSupported()) { m_zoomRatios = m_cameraSession->camera()->getZoomRatios(); qreal maxZoom = m_zoomRatios.last() / qreal(100); - if (m_maximumZoom != maxZoom) { - m_maximumZoom = maxZoom; - } + maximumZoomFactorChanged(maxZoom); zoomTo(1, -1); } else { m_zoomRatios.clear(); - m_maximumZoom = 1.0; + maximumZoomFactorChanged(1.0); } m_minExposureCompensationIndex = m_cameraSession->camera()->getMinExposureCompensation(); diff --git a/src/plugins/multimedia/android/mediacapture/qandroidcamera_p.h b/src/plugins/multimedia/android/mediacapture/qandroidcamera_p.h index 15ea9bf0e..77bbc3133 100644 --- a/src/plugins/multimedia/android/mediacapture/qandroidcamera_p.h +++ b/src/plugins/multimedia/android/mediacapture/qandroidcamera_p.h @@ -76,7 +76,6 @@ private: bool m_continuousVideoFocusSupported = false; bool m_focusPointSupported = false; - float m_maximumZoom; QList<int> m_zoomRatios; QList<QCamera::ExposureMode> m_supportedExposureModes; |