diff options
author | Ratchanan Srirattanamet <peathot@hotmail.com> | 2019-09-25 16:12:18 +0700 |
---|---|---|
committer | Ratchanan Srirattanamet <peathot@hotmail.com> | 2019-09-27 13:18:03 +0700 |
commit | d34c71a67c9a30ab67da0b6ad11c198bfe2b242d (patch) | |
tree | 70385f56a6db27d81c33766d40deb57b7ae9ec03 | |
parent | bf6ac0f0df5510aa65ecd9bb050bd13d47089d4a (diff) | |
download | qtmultimedia-d34c71a67c9a30ab67da0b6ad11c198bfe2b242d.tar.gz |
CameraBin: do fetch viewfinder settings even after LoadedStatus
Commit 84d0d87699a2a92b3207beae30a52f25e23acb65 (CameraBin: Postpone
fetching supported viewfinder settings) checks if the camera is in
LoadedStatus before fetching supported viewfinder settings. However, if
viewfinder settings is never requested or not (yet) available during
LoadedStatus, it won't try to fetch it at e.g. ActiveStatus. In that
case, requesting supported viewfinder settings never works.
[ChangeLog][CameraBin] CameraBin plugin now fetches supported viewfinder
settings at status higher or equal to LoadedStatus if it has not been
fetched.
Change-Id: Ibd32c25feac9b1a133945e754d26181937190a24
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index f064c7c92..b96ba6792 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -732,7 +732,7 @@ static QList<QCameraViewfinderSettings> capsToViewfinderSettings(GstCaps *suppor QList<QCameraViewfinderSettings> CameraBinSession::supportedViewfinderSettings() const { - if (m_status == QCamera::LoadedStatus && m_supportedViewfinderSettings.isEmpty()) { + if (m_status >= QCamera::LoadedStatus && m_supportedViewfinderSettings.isEmpty()) { m_supportedViewfinderSettings = capsToViewfinderSettings(supportedCaps(QCamera::CaptureViewfinder)); } |