slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AVFoundation: fix retrieving maximum camera zoom value.

Browse Source 
Maximum zoom value was incorrectly reset to 1.0 when doing the transition
Active -> Loaded -> Active.

Change-Id: I799900b1597637039d6c28d1d694fb6340b10540
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
This commit is contained in:
Yoann Lopes
2015-05-19 16:54:05 +02:00
parent 0df8d83932
commit 5fab28b581
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm
View File

@@ -128,11 +128,11 @@ void AVFCameraZoomControl::cameraStateChanged()
return; return;
} }
if (captureDevice.activeFormat.videoMaxZoomFactor > 1. if (captureDevice.activeFormat.videoMaxZoomFactor > 1.) {
&& !qFuzzyCompare(m_maxZoomFactor, captureDevice.activeFormat.videoMaxZoomFactor)) { if (!qFuzzyCompare(m_maxZoomFactor, captureDevice.activeFormat.videoMaxZoomFactor)) {
m_maxZoomFactor = captureDevice.activeFormat.videoMaxZoomFactor; m_maxZoomFactor = captureDevice.activeFormat.videoMaxZoomFactor;
Q_EMIT maximumDigitalZoomChanged(m_maxZoomFactor); Q_EMIT maximumDigitalZoomChanged(m_maxZoomFactor);
}
} else if (!qFuzzyCompare(m_maxZoomFactor, CGFloat(1.))) { } else if (!qFuzzyCompare(m_maxZoomFactor, CGFloat(1.))) {
m_maxZoomFactor = 1.; m_maxZoomFactor = 1.;