diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2016-02-11 01:47:12 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-06-09 12:28:18 +0000 |
commit | 2303d2fef8987f32b1615710ef8930f8d2854373 (patch) | |
tree | 5fbf705a0c83fa7717732f8b3b406895021b2e44 /src/plugins/avfoundation/camera/avfcameraservice.mm | |
parent | e1992d9d1db9e16161a4135d1a525482980c747d (diff) |
AVFoundation: implement QMediaContainerControl.
Change-Id: I5097a0450f5836e48a697249619a1822775f3ad8
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@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 dc50319d0..5599dfe4a 100644 --- a/src/plugins/avfoundation/camera/avfcameraservice.mm +++ b/src/plugins/avfoundation/camera/avfcameraservice.mm @@ -54,6 +54,7 @@ #include "avfimageencodercontrol.h" #include "avfcameraflashcontrol.h" #include "avfvideoencodersettingscontrol.h" +#include "avfmediacontainercontrol.h" #ifdef Q_OS_IOS #include "avfcamerazoomcontrol.h" @@ -101,6 +102,7 @@ AVFCameraService::AVFCameraService(QObject *parent): m_imageEncoderControl = new AVFImageEncoderControl(this); m_flashControl = new AVFCameraFlashControl(this); m_videoEncoderSettingsControl = new AVFVideoEncoderSettingsControl(this); + m_mediaContainerControl = new AVFMediaContainerControl(this); } AVFCameraService::~AVFCameraService() @@ -133,6 +135,7 @@ AVFCameraService::~AVFCameraService() delete m_imageEncoderControl; delete m_flashControl; delete m_videoEncoderSettingsControl; + delete m_mediaContainerControl; delete m_session; } @@ -182,6 +185,9 @@ QMediaControl *AVFCameraService::requestControl(const char *name) if (qstrcmp(name, QVideoEncoderSettingsControl_iid) == 0) return m_videoEncoderSettingsControl; + if (qstrcmp(name, QMediaContainerControl_iid) == 0) + return m_mediaContainerControl; + if (qstrcmp(name,QMediaVideoProbeControl_iid) == 0) { AVFMediaVideoProbeControl *videoProbe = 0; videoProbe = new AVFMediaVideoProbeControl(this); |