diff options
author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-02-12 10:17:09 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-03-02 12:44:51 +0000 |
commit | 33b27c3c15aaca611d5ed0164afa3cd2e9f891a7 (patch) | |
tree | 6d6cc8a7816035f72c286a57eb48ac791ca66f39 /src/plugins/avfoundation/camera/avfcameraservice.mm | |
parent | 985ee3261b3c82ddad87124657ee3fb61e311a4d (diff) |
Image encoder control - version for OS X/iOS
QImageEncoderControl - implementation for AVFoundation plugin (OS X/iOS,
at the moment iOS >= 7.0).
Change-Id: Ibc2c3ae48252dd4698e263f5abca5c328482d5e7
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameraservice.mm')
-rw-r--r-- | src/plugins/avfoundation/camera/avfcameraservice.mm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameraservice.mm b/src/plugins/avfoundation/camera/avfcameraservice.mm index f9c7e5ae6..0485abdcd 100644 --- a/src/plugins/avfoundation/camera/avfcameraservice.mm +++ b/src/plugins/avfoundation/camera/avfcameraservice.mm @@ -51,6 +51,7 @@ #include "avfcamerafocuscontrol.h" #include "avfcameraexposurecontrol.h" #include "avfcameraviewfindersettingscontrol.h" +#include "avfimageencodercontrol.h" #ifdef Q_OS_IOS #include "avfcamerazoomcontrol.h" @@ -87,6 +88,7 @@ AVFCameraService::AVFCameraService(QObject *parent): #endif m_viewfinderSettingsControl2 = new AVFCameraViewfinderSettingsControl2(this); m_viewfinderSettingsControl = new AVFCameraViewfinderSettingsControl(this); + m_imageEncoderControl = new AVFImageEncoderControl(this); } AVFCameraService::~AVFCameraService() @@ -112,6 +114,7 @@ AVFCameraService::~AVFCameraService() #endif delete m_viewfinderSettingsControl2; delete m_viewfinderSettingsControl; + delete m_imageEncoderControl; delete m_session; } @@ -152,6 +155,9 @@ QMediaControl *AVFCameraService::requestControl(const char *name) if (qstrcmp(name, QCameraViewfinderSettingsControl_iid) == 0) return m_viewfinderSettingsControl; + if (qstrcmp(name, QImageEncoderControl_iid) == 0) + return m_imageEncoderControl; + if (qstrcmp(name,QMediaVideoProbeControl_iid) == 0) { AVFMediaVideoProbeControl *videoProbe = 0; videoProbe = new AVFMediaVideoProbeControl(this); |