diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-11-01 14:11:41 +0100 |
|---|---|---|
| committer | Jeremy Powell <jeremy@visionaid.com> | 2019-11-11 19:56:43 +0000 |
| commit | d381fb9823dac7e1e19b2b2af6b57ddf1306346a (patch) | |
| tree | 3607cc4556a18acea100701b7440a543a0724315 | |
| parent | 49ce2d783b1bb74c119794420f1e96e2fe0531c0 (diff) | |
Qt Multimedia - fix build for iOS
Since RestrictedBool conversion operator was introduced, objective-C
method calls require explicit .data() on our smart pointers.
Fixes: QTBUG-78685
Change-Id: Ie32ebf0442cd56a01466aa58b89651d7c293de6d
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
(cherry picked from commit b64bdf32ce10b039e8d7b1be18d001e89f315615)
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rw-r--r-- | src/plugins/avfoundation/camera/avfmediaassetwriter.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm b/src/plugins/avfoundation/camera/avfmediaassetwriter.mm index 5a1257f6c..b9253048b 100644 --- a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm +++ b/src/plugins/avfoundation/camera/avfmediaassetwriter.mm @@ -382,7 +382,7 @@ enum WriterState m_audioOutput.reset([[AVCaptureAudioDataOutput alloc] init]); - if (m_audioOutput && [captureSession canAddOutput:m_audioOutput]) { + if (m_audioOutput.data() && [captureSession canAddOutput:m_audioOutput]) { [captureSession addOutput:m_audioOutput]; } else { qDebugCamera() << Q_FUNC_INFO << "failed to add audio output"; @@ -400,7 +400,7 @@ enum WriterState { Q_ASSERT(m_service && m_service->videoOutput() && m_service->videoOutput()->videoDataOutput()); - Q_ASSERT(m_assetWriter); + Q_ASSERT(m_assetWriter.data()); m_cameraWriterInput.reset([[AVAssetWriterInput alloc] initWithMediaType:AVMediaTypeVideo outputSettings:m_videoSettings @@ -420,7 +420,7 @@ enum WriterState m_cameraWriterInput.data().expectsMediaDataInRealTime = YES; - if (m_audioOutput) { + if (m_audioOutput.data()) { CMFormatDescriptionRef sourceFormat = m_audioCaptureDevice ? m_audioCaptureDevice.activeFormat.formatDescription : 0; m_audioWriterInput.reset([[AVAssetWriterInput alloc] initWithMediaType:AVMediaTypeAudio outputSettings:m_audioSettings @@ -448,7 +448,7 @@ enum WriterState [m_service->videoOutput()->videoDataOutput() setSampleBufferDelegate:self queue:m_videoQueue]; - if (m_audioOutput) { + if (m_audioOutput.data()) { Q_ASSERT(m_audioQueue); [m_audioOutput setSampleBufferDelegate:self queue:m_audioQueue]; } |