diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-03-04 16:34:32 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-03-10 16:35:59 +0000 |
| commit | f839f9e3eb2cd89f2b458349a08f9e5444744f1b (patch) | |
| tree | a39c78e2fe3541da7dfd8e2e2197faf1d039769c /src/plugins/avfoundation/camera/avfcamerasession.h | |
| parent | dbcf44247d41fa456329da30ae378a69de19e3cd (diff) | |
AVCaptureDeviceFormat - avoid duplicates (OS X/iOS)
Excluding video range (iOS) is not the right way to avoid "duplicates" - with
other devices there can be also duplicates (formats with the same resolutions),
but completely different pixel formats. Since we do not know what they will be in advance,
we take the media subtype from the initial preset for a capture device and use it
as a filter. Update viewfinder and image encoder settings controls.
Change-Id: If20aea24b19b43574d5c3e9bf2ba85f50fc08916
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.h')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerasession.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.h b/src/plugins/avfoundation/camera/avfcamerasession.h index 4f418cb1d..9fd0b1828 100644 --- a/src/plugins/avfoundation/camera/avfcamerasession.h +++ b/src/plugins/avfoundation/camera/avfcamerasession.h @@ -80,6 +80,7 @@ public: void addProbe(AVFMediaVideoProbeControl *probe); void removeProbe(AVFMediaVideoProbeControl *probe); + FourCharCode defaultCodec(); public Q_SLOTS: void setState(QCamera::State state); @@ -119,6 +120,7 @@ private: QSet<AVFMediaVideoProbeControl *> m_videoProbes; QMutex m_videoProbesMutex; + FourCharCode m_defaultCodec; }; QT_END_NAMESPACE |