diff options
author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-03-20 18:33:28 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-05-29 16:29:39 +0000 |
commit | 1508f775acfd7aad18e71dde35c3ff0c9b073fc1 (patch) | |
tree | 81e6ab4c4762e28a2a035db358456afc006f9435 /src/plugins/avfoundation/camera/camera.pro | |
parent | aeb79d4a8bcb291822d74d923f7e68fb02ce96fe (diff) |
Video asset writer for iOS
AVFoundation on iOS lacks the ability to use AVCaptureVideoDataOutput and
AVCaptureMovieFileOutput simultaneously. Right now viewfinder stops working
as soon as we add movie file output. The only workaround
we have now is to write video/audio 'maually' - creating asset writer
and feeding it with audio/video samples.
Change-Id: I33a63546783279c545f0433b5051287269825d3f
Task-number: QTBUG-37655
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/avfoundation/camera/camera.pro')
-rw-r--r-- | src/plugins/avfoundation/camera/camera.pro | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro index ac389df77..62afdcd82 100644 --- a/src/plugins/avfoundation/camera/camera.pro +++ b/src/plugins/avfoundation/camera/camera.pro @@ -27,7 +27,6 @@ HEADERS += \ avfcameracontrol.h \ avfcamerametadatacontrol.h \ avfimagecapturecontrol.h \ - avfmediarecordercontrol.h \ avfcameraservice.h \ avfcamerasession.h \ avfstoragelocation.h \ @@ -49,7 +48,6 @@ OBJECTIVE_SOURCES += \ avfcameracontrol.mm \ avfcamerametadatacontrol.mm \ avfimagecapturecontrol.mm \ - avfmediarecordercontrol.mm \ avfcameraservice.mm \ avfcamerasession.mm \ avfstoragelocation.mm \ @@ -66,9 +64,20 @@ OBJECTIVE_SOURCES += \ avfimageencodercontrol.mm \ avfcameraflashcontrol.mm +osx { + +HEADERS += avfmediarecordercontrol.h +OBJECTIVE_SOURCES += avfmediarecordercontrol.mm + +} + ios { -HEADERS += avfcamerazoomcontrol.h -OBJECTIVE_SOURCES += avfcamerazoomcontrol.mm +HEADERS += avfcamerazoomcontrol.h \ + avfmediaassetwriter.h \ + avfmediarecordercontrol_ios.h +OBJECTIVE_SOURCES += avfcamerazoomcontrol.mm \ + avfmediaassetwriter.mm \ + avfmediarecordercontrol_ios.mm } |