diff options
Diffstat (limited to 'src/multimedia/camera/qcamera.cpp')
| -rw-r--r-- | src/multimedia/camera/qcamera.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index e70bed047..ea1b6beb6 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -72,6 +72,9 @@ static bool qt_sizeLessThan(const QSize &s1, const QSize &s2) static bool qt_frameRateRangeLessThan(const QCamera::FrameRateRange &s1, const QCamera::FrameRateRange &s2) { + if (s1.maximumFrameRate == s2.maximumFrameRate) + return s1.minimumFrameRate < s2.minimumFrameRate; + return s1.maximumFrameRate < s2.maximumFrameRate; } @@ -658,7 +661,7 @@ QList<QCameraViewfinderSettings> QCamera::supportedViewfinderSettings(const QCam && (qFuzzyIsNull(settings.minimumFrameRate()) || qFuzzyCompare((float)settings.minimumFrameRate(), (float)s.minimumFrameRate())) && (qFuzzyIsNull(settings.maximumFrameRate()) || qFuzzyCompare((float)settings.maximumFrameRate(), (float)s.maximumFrameRate())) && (settings.pixelFormat() == QVideoFrame::Format_Invalid || settings.pixelFormat() == s.pixelFormat()) - && (settings.pixelAspectRatio() == QSize(1, 1) || settings.pixelAspectRatio() == s.pixelAspectRatio())) { + && (settings.pixelAspectRatio().isEmpty() || settings.pixelAspectRatio() == s.pixelAspectRatio())) { results.append(s); } } @@ -1043,6 +1046,19 @@ void QCamera::unlock() */ /*! + \fn QCamera::FrameRateRange::FrameRateRange() + + Constructs a null frame rate range, with both minimumFrameRate and maximumFrameRate + equal to \c 0.0. +*/ + +/*! + \fn QCamera::FrameRateRange::FrameRateRange(qreal minimum, qreal maximum) + + Constructs a frame rate range with the given \a minimum and \a maximum frame rates. +*/ + +/*! \variable QCamera::FrameRateRange::minimumFrameRate The minimum frame rate supported by the range, in frames per second. */ |