Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: I5b99b3d05502e15373ebaedcad06d6ab4d25d387

3 files changed, 24 insertions, 20 deletions

diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.h b/src/plugins/avfoundation/camera/avfmediaassetwriter.h
index 9d61d5089..f063dab4b 100644
--- a/src/plugins/avfoundation/camera/avfmediaassetwriter.h
+++ b/src/plugins/avfoundation/camera/avfmediaassetwriter.h
@@ -43,7 +43,6 @@
 #include "avfcamerautility.h"
 
 #include <QtCore/qglobal.h>
-#include <QtCore/qatomic.h>
 
 #include <AVFoundation/AVFoundation.h>
 
@@ -52,17 +51,10 @@ QT_BEGIN_NAMESPACE
 class AVFMediaRecorderControlIOS;
 class AVFCameraService;
 
-typedef QAtomicInteger<qint64> AVFAtomicInt64;
-
 QT_END_NAMESPACE
 
 @interface QT_MANGLE_NAMESPACE(AVFMediaAssetWriter) : NSObject<AVCaptureVideoDataOutputSampleBufferDelegate,
                                                                AVCaptureAudioDataOutputSampleBufferDelegate>
-{
-@public
-    QT_PREPEND_NAMESPACE(AVFAtomicInt64) m_durationInMs;
-}
-
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(AVFMediaRecorderControlIOS) *)delegate;
 
 - (bool)setupWithFileURL:(NSURL *)fileURL
@@ -76,6 +68,7 @@ QT_END_NAMESPACE
 - (void)stop;
 // This to be called from the recorder control's dtor:
 - (void)abort;
+- (qint64)durationInMs;
 
 @end
 
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm b/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
index 9030adb2c..2d40b9087 100644
--- a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
+++ b/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
@@ -47,6 +47,7 @@
 #include "avfmediacontainercontrol.h"
 
 #include <QtCore/qmetaobject.h>
+#include <QtCore/qatomic.h>
 
 QT_USE_NAMESPACE
 
@@ -79,6 +80,8 @@ enum WriterState
     WriterStateAborted
 };
 
+using AVFAtomicInt64 = QAtomicInteger<qint64>;
+
 } // unnamed namespace
 
 @interface QT_MANGLE_NAMESPACE(AVFMediaAssetWriter) (PrivateAPI)
@@ -93,32 +96,35 @@ enum WriterState
 @private
     AVFCameraService *m_service;
 
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_cameraWriterInput;
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVCaptureDeviceInput> m_audioInput;
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVCaptureAudioDataOutput> m_audioOutput;
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_audioWriterInput;
+    AVFScopedPointer<AVAssetWriterInput> m_cameraWriterInput;
+    AVFScopedPointer<AVCaptureDeviceInput> m_audioInput;
+    AVFScopedPointer<AVCaptureAudioDataOutput> m_audioOutput;
+    AVFScopedPointer<AVAssetWriterInput> m_audioWriterInput;
+
     AVCaptureDevice *m_audioCaptureDevice;
 
     // Queue to write sample buffers:
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_writerQueue;
+    AVFScopedPointer<dispatch_queue_t> m_writerQueue;
     // High priority serial queue for video output:
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_videoQueue;
+    AVFScopedPointer<dispatch_queue_t> m_videoQueue;
     // Serial queue for audio output:
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_audioQueue;
+    AVFScopedPointer<dispatch_queue_t> m_audioQueue;
 
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriter> m_assetWriter;
+    AVFScopedPointer<AVAssetWriter> m_assetWriter;
 
-    QT_PREPEND_NAMESPACE(AVFMediaRecorderControlIOS) *m_delegate;
+    AVFMediaRecorderControlIOS *m_delegate;
 
     bool m_setStartTime;
 
-    QT_PREPEND_NAMESPACE(QAtomicInt) m_state;
-@private
+    QAtomicInt m_state;
+
     CMTime m_startTime;
     CMTime m_lastTimeStamp;
 
     NSDictionary *m_audioSettings;
     NSDictionary *m_videoSettings;
+
+    AVFAtomicInt64 m_durationInMs;
 }
 
 - (id)initWithDelegate:(AVFMediaRecorderControlIOS *)delegate
@@ -500,4 +506,9 @@ enum WriterState
     }
 }
 
+- (qint64)durationInMs
+{
+    return m_durationInMs.loadAcquire();
+}
+
 @end
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm
index 0b31bd0bc..62197e900 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm
+++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm
@@ -144,7 +144,7 @@ QMediaRecorder::Status AVFMediaRecorderControlIOS::status() const
 
 qint64 AVFMediaRecorderControlIOS::duration() const
 {
-    return m_writer.data()->m_durationInMs.load();
+    return m_writer.data().durationInMs;
 }
 
 bool AVFMediaRecorderControlIOS::isMuted() const