summaryrefslogtreecommitdiffstats
path: root/src/plugins/avfoundation/camera/avfcamerasession.mm
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2016-02-10 14:52:44 +0100
committerYoann Lopes <yoann.lopes@qt.io>2016-06-03 09:43:10 +0000
commit4fa23e08a116b4d9bb67e25771c511838104999f (patch)
tree533c4057ddc353774a2c8a34c0d8c74f32c2ebf3 /src/plugins/avfoundation/camera/avfcamerasession.mm
parentc0319d1cfb056c2e26f436357cdfdb3bdecd10f0 (diff)
AVFoundation: implement QVideoEncoderSettingsControl.
Task-number: QTBUG-40338 Change-Id: Ic23dabaad94d7b293019460710ae1a097002e227 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.mm')
-rw-r--r--src/plugins/avfoundation/camera/avfcamerasession.mm6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index 993e28319..eac1b44ec 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -386,13 +386,11 @@ bool AVFCameraSession::applyViewfinderSettings()
// resolution is set, it takes precedence over the viewfinder resolution.
if (AVFImageEncoderControl *imControl = m_service->imageEncoderControl()) {
const QSize imageResolution(imControl->requestedSettings().resolution());
- if (!imageResolution.isNull() && imageResolution.isValid()) {
+ if (!imageResolution.isNull() && imageResolution.isValid())
vfSettings.setResolution(imageResolution);
- vfControl->setViewfinderSettings(vfSettings);
- }
}
- return vfControl->applySettings();
+ return vfControl->applySettings(vfSettings);
}
return false;