Simplify lifetime management of QPlatformAudioResampler

QPlatformMediaIntegration creates various objects, and return them as
QMaybe<Type*>. This moves responsibility of ownership to the caller.

This patch makes the createAudioResampler function return the resampler
as QMaybe<std::unique_ptr<Type>> which simplifies lifetime management.

This introduces an asymmetry with other factory functions, but this is
a step in the right direction

Pick-to: 6.7 6.6 6.5
Change-Id: Id2f67597c8d8271b184321d138e126edff5f3202
Reviewed-by: Tim Blechmann <tim@klingt.org>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Lars Sutterud <lars.sutterud@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>

2 files changed, 9 insertions, 5 deletions

diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp
index dcb412acf..1eb113b28 100644
--- a/src/multimedia/platform/qplatformmediaintegration.cpp
+++ b/src/multimedia/platform/qplatformmediaintegration.cpp
@@ -7,6 +7,7 @@
 #include <qmutex.h>
 #include <qplatformaudioinput_p.h>
 #include <qplatformaudiooutput_p.h>
+#include <qplatformaudioresampler_p.h>
 #include <qplatformvideodevices_p.h>
 #include <qmediadevices.h>
 #include <qcameradevice.h>
@@ -118,6 +119,12 @@ QList<QCameraDevice> QPlatformMediaIntegration::videoInputs()
     return devices ? devices->videoDevices() : QList<QCameraDevice>{};
 }
 
+QMaybe<std::unique_ptr<QPlatformAudioResampler>>
+QPlatformMediaIntegration::createAudioResampler(const QAudioFormat &, const QAudioFormat &)
+{
+    return notAvailable;
+}
+
 QMaybe<QPlatformAudioInput *> QPlatformMediaIntegration::createAudioInput(QAudioInput *q)
 {
     return new QPlatformAudioInput(q);
diff --git a/src/multimedia/platform/qplatformmediaintegration_p.h b/src/multimedia/platform/qplatformmediaintegration_p.h
index 4673c47b3..d47687586 100644
--- a/src/multimedia/platform/qplatformmediaintegration_p.h
+++ b/src/multimedia/platform/qplatformmediaintegration_p.h
@@ -71,12 +71,9 @@ public:
     virtual QPlatformSurfaceCapture *createWindowCapture(QWindowCapture *) { return nullptr; }
 
     virtual QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *) { return notAvailable; }
-    virtual QMaybe<QPlatformAudioResampler *>
+    virtual QMaybe<std::unique_ptr<QPlatformAudioResampler>>
     createAudioResampler(const QAudioFormat & /*inputFormat*/,
-                         const QAudioFormat & /*outputFormat*/)
-    {
-        return notAvailable;
-    }
+                         const QAudioFormat & /*outputFormat*/);
     virtual QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() { return notAvailable; }
     virtual QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *) { return notAvailable; }
     virtual QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *) { return notAvailable; }