summaryrefslogtreecommitdiffstats
path: root/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2016-02-11 01:47:12 +0100
committerYoann Lopes <yoann.lopes@qt.io>2016-06-09 12:28:18 +0000
commit2303d2fef8987f32b1615710ef8930f8d2854373 (patch)
tree5fbf705a0c83fa7717732f8b3b406895021b2e44 /src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
parente1992d9d1db9e16161a4135d1a525482980c747d (diff)
AVFoundation: implement QMediaContainerControl.
Change-Id: I5097a0450f5836e48a697249619a1822775f3ad8 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfmediarecordercontrol.mm')
-rw-r--r--src/plugins/avfoundation/camera/avfmediarecordercontrol.mm5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm b/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
index 4a3091f24..de2b14ef4 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
+++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
@@ -38,6 +38,7 @@
#include "avfcameracontrol.h"
#include "avfaudioinputselectorcontrol.h"
#include "avfvideoencodersettingscontrol.h"
+#include "avfmediacontainercontrol.h"
#include <QtCore/qurl.h>
#include <QtCore/qfileinfo.h>
@@ -260,11 +261,13 @@ void AVFMediaRecorderControl::setState(QMediaRecorder::State state)
QString outputLocationPath = m_outputLocation.scheme() == QLatin1String("file") ?
m_outputLocation.path() : m_outputLocation.toString();
+ QString extension = m_service->mediaContainerControl()->containerFormat();
+
QUrl actualLocation = QUrl::fromLocalFile(
m_storageLocation.generateFileName(outputLocationPath,
QCamera::CaptureVideo,
QLatin1String("clip_"),
- QLatin1String("mp4")));
+ extension));
qDebugCamera() << "Video capture location:" << actualLocation.toString();