diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-13 16:52:57 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-18 12:58:00 +0000 |
commit | 13e40d522f6992d7fff38581e4b0005129669bde (patch) | |
tree | 02b0dd23fae410eabf0d0a8b38fa6faac3997818 /src/multimedia/camera | |
parent | e0b9217d27509ded76daf6b18e1ed4c0fab280c7 (diff) |
Fix QCamera viewfinder capabilities functions..
- Filtering the results for a specific pixel aspect ratio would return
wrong values.
- Correctly sort the frame rate ranges returned by
supportedViewfinderFrameRateRanges().
Added missing auto-tests for all viewfinder capabilities functions.
Change-Id: Idfb40d4139cc48a5996ce2ddd98131a2f5be76bb
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r-- | src/multimedia/camera/qcamera.cpp | 5 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraviewfindersettings.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index a5fee2767..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); } } diff --git a/src/multimedia/camera/qcameraviewfindersettings.cpp b/src/multimedia/camera/qcameraviewfindersettings.cpp index df4fa7022..af0d614ca 100644 --- a/src/multimedia/camera/qcameraviewfindersettings.cpp +++ b/src/multimedia/camera/qcameraviewfindersettings.cpp @@ -50,8 +50,7 @@ public: isNull(true), minimumFrameRate(0.0), maximumFrameRate(0.0), - pixelFormat(QVideoFrame::Format_Invalid), - pixelAspectRatio(1, 1) + pixelFormat(QVideoFrame::Format_Invalid) { } |