diff options
Diffstat (limited to 'src/plugins/multimedia')
12 files changed, 94 insertions, 93 deletions
diff --git a/src/plugins/multimedia/android/qandroidintegration.cpp b/src/plugins/multimedia/android/qandroidintegration.cpp index 1ecd66d49..b33717341 100644 --- a/src/plugins/multimedia/android/qandroidintegration.cpp +++ b/src/plugins/multimedia/android/qandroidintegration.cpp @@ -54,7 +54,7 @@ QAndroidIntegration::~QAndroidIntegration() delete m_formatInfo; } -QPlatformAudioDecoder *QAndroidIntegration::createAudioDecoder(QAudioDecoder *decoder) +QMaybe<QPlatformAudioDecoder *> QAndroidIntegration::createAudioDecoder(QAudioDecoder *decoder) { return new QAndroidAudioDecoder(decoder); } @@ -67,42 +67,42 @@ QPlatformMediaFormatInfo *QAndroidIntegration::formatInfo() } -QPlatformMediaCaptureSession *QAndroidIntegration::createCaptureSession() +QMaybe<QPlatformMediaCaptureSession *> QAndroidIntegration::createCaptureSession() { return new QAndroidMediaCaptureSession(); } -QPlatformMediaPlayer *QAndroidIntegration::createPlayer(QMediaPlayer *player) +QMaybe<QPlatformMediaPlayer *> QAndroidIntegration::createPlayer(QMediaPlayer *player) { return new QAndroidMediaPlayer(player); } -QPlatformCamera *QAndroidIntegration::createCamera(QCamera *camera) +QMaybe<QPlatformCamera *> QAndroidIntegration::createCamera(QCamera *camera) { return new QAndroidCamera(camera); } -QPlatformMediaRecorder *QAndroidIntegration::createRecorder(QMediaRecorder *recorder) +QMaybe<QPlatformMediaRecorder *> QAndroidIntegration::createRecorder(QMediaRecorder *recorder) { return new QAndroidMediaEncoder(recorder); } -QPlatformImageCapture *QAndroidIntegration::createImageCapture(QImageCapture *imageCapture) +QMaybe<QPlatformImageCapture *> QAndroidIntegration::createImageCapture(QImageCapture *imageCapture) { return new QAndroidImageCapture(imageCapture); } -QPlatformAudioOutput *QAndroidIntegration::createAudioOutput(QAudioOutput *q) +QMaybe<QPlatformAudioOutput *> QAndroidIntegration::createAudioOutput(QAudioOutput *q) { return new QAndroidAudioOutput(q); } -QPlatformAudioInput *QAndroidIntegration::createAudioInput(QAudioInput *audioInput) +QMaybe<QPlatformAudioInput *> QAndroidIntegration::createAudioInput(QAudioInput *audioInput) { return new QAndroidAudioInput(audioInput); } -QPlatformVideoSink *QAndroidIntegration::createVideoSink(QVideoSink *sink) +QMaybe<QPlatformVideoSink *> QAndroidIntegration::createVideoSink(QVideoSink *sink) { return new QAndroidVideoSink(sink); } diff --git a/src/plugins/multimedia/android/qandroidintegration_p.h b/src/plugins/multimedia/android/qandroidintegration_p.h index 4072b014d..d6df4dbef 100644 --- a/src/plugins/multimedia/android/qandroidintegration_p.h +++ b/src/plugins/multimedia/android/qandroidintegration_p.h @@ -29,17 +29,17 @@ public: QPlatformMediaFormatInfo *formatInfo() override; - QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *decoder) override; - QPlatformMediaCaptureSession *createCaptureSession() override; - QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; - QPlatformCamera *createCamera(QCamera *camera) override; - QPlatformMediaRecorder *createRecorder(QMediaRecorder *recorder) override; - QPlatformImageCapture *createImageCapture(QImageCapture *imageCapture) override; + QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *decoder) override; + QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override; + QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *player) override; + QMaybe<QPlatformCamera *> createCamera(QCamera *camera) override; + QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *recorder) override; + QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *imageCapture) override; - QPlatformAudioOutput *createAudioOutput(QAudioOutput *q) override; - QPlatformAudioInput *createAudioInput(QAudioInput *audioInput) override; + QMaybe<QPlatformAudioOutput *> createAudioOutput(QAudioOutput *q) override; + QMaybe<QPlatformAudioInput *> createAudioInput(QAudioInput *audioInput) override; - QPlatformVideoSink *createVideoSink(QVideoSink *) override; + QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *) override; QList<QCameraDevice> videoInputs() override; QPlatformMediaFormatInfo *m_formatInfo = nullptr; diff --git a/src/plugins/multimedia/darwin/qdarwinintegration.mm b/src/plugins/multimedia/darwin/qdarwinintegration.mm index 314ceaff6..5e26fe5c4 100644 --- a/src/plugins/multimedia/darwin/qdarwinintegration.mm +++ b/src/plugins/multimedia/darwin/qdarwinintegration.mm @@ -57,37 +57,37 @@ QPlatformMediaFormatInfo *QDarwinIntegration::formatInfo() return m_formatInfo; } -QPlatformAudioDecoder *QDarwinIntegration::createAudioDecoder(QAudioDecoder *decoder) +QMaybe<QPlatformAudioDecoder *> QDarwinIntegration::createAudioDecoder(QAudioDecoder *decoder) { return new AVFAudioDecoder(decoder); } -QPlatformMediaCaptureSession *QDarwinIntegration::createCaptureSession() +QMaybe<QPlatformMediaCaptureSession *> QDarwinIntegration::createCaptureSession() { return new AVFCameraService; } -QPlatformMediaPlayer *QDarwinIntegration::createPlayer(QMediaPlayer *player) +QMaybe<QPlatformMediaPlayer *> QDarwinIntegration::createPlayer(QMediaPlayer *player) { return new AVFMediaPlayer(player); } -QPlatformCamera *QDarwinIntegration::createCamera(QCamera *camera) +QMaybe<QPlatformCamera *> QDarwinIntegration::createCamera(QCamera *camera) { return new AVFCamera(camera); } -QPlatformMediaRecorder *QDarwinIntegration::createRecorder(QMediaRecorder *recorder) +QMaybe<QPlatformMediaRecorder *> QDarwinIntegration::createRecorder(QMediaRecorder *recorder) { return new AVFMediaEncoder(recorder); } -QPlatformImageCapture *QDarwinIntegration::createImageCapture(QImageCapture *imageCapture) +QMaybe<QPlatformImageCapture *> QDarwinIntegration::createImageCapture(QImageCapture *imageCapture) { return new AVFImageCapture(imageCapture); } -QPlatformVideoSink *QDarwinIntegration::createVideoSink(QVideoSink *sink) +QMaybe<QPlatformVideoSink *> QDarwinIntegration::createVideoSink(QVideoSink *sink) { return new AVFVideoSink(sink); } diff --git a/src/plugins/multimedia/darwin/qdarwinintegration_p.h b/src/plugins/multimedia/darwin/qdarwinintegration_p.h index eb6bfbdce..f8f897c51 100644 --- a/src/plugins/multimedia/darwin/qdarwinintegration_p.h +++ b/src/plugins/multimedia/darwin/qdarwinintegration_p.h @@ -29,14 +29,14 @@ public: QPlatformMediaFormatInfo *formatInfo() override; - QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *) override; - QPlatformMediaCaptureSession *createCaptureSession() override; - QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; - QPlatformCamera *createCamera(QCamera *camera) override; - QPlatformMediaRecorder *createRecorder(QMediaRecorder *) override; - QPlatformImageCapture *createImageCapture(QImageCapture *) override; - - QPlatformVideoSink *createVideoSink(QVideoSink *) override; + QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *) override; + QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override; + QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *player) override; + QMaybe<QPlatformCamera *> createCamera(QCamera *camera) override; + QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *) override; + QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *) override; + + QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *) override; QPlatformMediaFormatInfo *m_formatInfo = nullptr; }; diff --git a/src/plugins/multimedia/ffmpeg/qffmpegmediaintegration.cpp b/src/plugins/multimedia/ffmpeg/qffmpegmediaintegration.cpp index b51a9996f..e55444cc2 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegmediaintegration.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegmediaintegration.cpp @@ -86,22 +86,22 @@ QPlatformMediaFormatInfo *QFFmpegMediaIntegration::formatInfo() return m_formatsInfo; } -QPlatformAudioDecoder *QFFmpegMediaIntegration::createAudioDecoder(QAudioDecoder *decoder) +QMaybe<QPlatformAudioDecoder *> QFFmpegMediaIntegration::createAudioDecoder(QAudioDecoder *decoder) { return new QFFmpegAudioDecoder(decoder); } -QPlatformMediaCaptureSession *QFFmpegMediaIntegration::createCaptureSession() +QMaybe<QPlatformMediaCaptureSession *> QFFmpegMediaIntegration::createCaptureSession() { return new QFFmpegMediaCaptureSession(); } -QPlatformMediaPlayer *QFFmpegMediaIntegration::createPlayer(QMediaPlayer *player) +QMaybe<QPlatformMediaPlayer *> QFFmpegMediaIntegration::createPlayer(QMediaPlayer *player) { return new QFFmpegMediaPlayer(player); } -QPlatformCamera *QFFmpegMediaIntegration::createCamera(QCamera *camera) +QMaybe<QPlatformCamera *> QFFmpegMediaIntegration::createCamera(QCamera *camera) { #ifdef Q_OS_DARWIN return new QAVFCamera(camera); @@ -115,22 +115,22 @@ QPlatformCamera *QFFmpegMediaIntegration::createCamera(QCamera *camera) #endif } -QPlatformMediaRecorder *QFFmpegMediaIntegration::createRecorder(QMediaRecorder *recorder) +QMaybe<QPlatformMediaRecorder *> QFFmpegMediaIntegration::createRecorder(QMediaRecorder *recorder) { return new QFFmpegMediaRecorder(recorder); } -QPlatformImageCapture *QFFmpegMediaIntegration::createImageCapture(QImageCapture *imageCapture) +QMaybe<QPlatformImageCapture *> QFFmpegMediaIntegration::createImageCapture(QImageCapture *imageCapture) { return new QFFmpegImageCapture(imageCapture); } -QPlatformVideoSink *QFFmpegMediaIntegration::createVideoSink(QVideoSink *sink) +QMaybe<QPlatformVideoSink *> QFFmpegMediaIntegration::createVideoSink(QVideoSink *sink) { return new QFFmpegVideoSink(sink); } -QPlatformAudioInput *QFFmpegMediaIntegration::createAudioInput(QAudioInput *input) +QMaybe<QPlatformAudioInput *> QFFmpegMediaIntegration::createAudioInput(QAudioInput *input) { return new QFFmpegAudioInput(input); } diff --git a/src/plugins/multimedia/ffmpeg/qffmpegmediaintegration_p.h b/src/plugins/multimedia/ffmpeg/qffmpegmediaintegration_p.h index 08ca227a2..35c062f16 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegmediaintegration_p.h +++ b/src/plugins/multimedia/ffmpeg/qffmpegmediaintegration_p.h @@ -30,16 +30,17 @@ public: static QFFmpegMediaIntegration *instance() { return static_cast<QFFmpegMediaIntegration *>(QPlatformMediaIntegration::instance()); } QPlatformMediaFormatInfo *formatInfo() override; - QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *decoder) override; - QPlatformMediaCaptureSession *createCaptureSession() override; - QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; - QPlatformCamera *createCamera(QCamera *) override; - QPlatformMediaRecorder *createRecorder(QMediaRecorder *) override; - QPlatformImageCapture *createImageCapture(QImageCapture *) override; - QPlatformVideoSink *createVideoSink(QVideoSink *sink) override; + QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *decoder) override; + QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override; + QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *player) override; + QMaybe<QPlatformCamera *> createCamera(QCamera *) override; + QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *) override; + QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *) override; - QPlatformAudioInput *createAudioInput(QAudioInput *input) override; + QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *sink) override; + + QMaybe<QPlatformAudioInput *> createAudioInput(QAudioInput *input) override; // QPlatformAudioOutput *createAudioOutput(QAudioOutput *) override; QFFmpegMediaFormatInfo *m_formatsInfo = nullptr; diff --git a/src/plugins/multimedia/gstreamer/qgstreamerintegration.cpp b/src/plugins/multimedia/gstreamer/qgstreamerintegration.cpp index bb2892f83..817aae1c2 100644 --- a/src/plugins/multimedia/gstreamer/qgstreamerintegration.cpp +++ b/src/plugins/multimedia/gstreamer/qgstreamerintegration.cpp @@ -59,47 +59,47 @@ const QGstreamerFormatInfo *QGstreamerIntegration::gstFormatsInfo() const return m_formatsInfo; } -QPlatformAudioDecoder *QGstreamerIntegration::createAudioDecoder(QAudioDecoder *decoder) +QMaybe<QPlatformAudioDecoder *> QGstreamerIntegration::createAudioDecoder(QAudioDecoder *decoder) { return new QGstreamerAudioDecoder(decoder); } -QPlatformMediaCaptureSession *QGstreamerIntegration::createCaptureSession() +QMaybe<QPlatformMediaCaptureSession *> QGstreamerIntegration::createCaptureSession() { return new QGstreamerMediaCapture(); } -QPlatformMediaPlayer *QGstreamerIntegration::createPlayer(QMediaPlayer *player) +QMaybe<QPlatformMediaPlayer *> QGstreamerIntegration::createPlayer(QMediaPlayer *player) { return new QGstreamerMediaPlayer(player); } -QPlatformCamera *QGstreamerIntegration::createCamera(QCamera *camera) +QMaybe<QPlatformCamera *> QGstreamerIntegration::createCamera(QCamera *camera) { return new QGstreamerCamera(camera); } -QPlatformMediaRecorder *QGstreamerIntegration::createRecorder(QMediaRecorder *recorder) +QMaybe<QPlatformMediaRecorder *> QGstreamerIntegration::createRecorder(QMediaRecorder *recorder) { return new QGstreamerMediaEncoder(recorder); } -QPlatformImageCapture *QGstreamerIntegration::createImageCapture(QImageCapture *imageCapture) +QMaybe<QPlatformImageCapture *> QGstreamerIntegration::createImageCapture(QImageCapture *imageCapture) { return new QGstreamerImageCapture(imageCapture); } -QPlatformVideoSink *QGstreamerIntegration::createVideoSink(QVideoSink *sink) +QMaybe<QPlatformVideoSink *> QGstreamerIntegration::createVideoSink(QVideoSink *sink) { return new QGstreamerVideoSink(sink); } -QPlatformAudioInput *QGstreamerIntegration::createAudioInput(QAudioInput *q) +QMaybe<QPlatformAudioInput *> QGstreamerIntegration::createAudioInput(QAudioInput *q) { return new QGstreamerAudioInput(q); } -QPlatformAudioOutput *QGstreamerIntegration::createAudioOutput(QAudioOutput *q) +QMaybe<QPlatformAudioOutput *> QGstreamerIntegration::createAudioOutput(QAudioOutput *q) { return new QGstreamerAudioOutput(q); } diff --git a/src/plugins/multimedia/gstreamer/qgstreamerintegration_p.h b/src/plugins/multimedia/gstreamer/qgstreamerintegration_p.h index 2668b51d0..387909b2e 100644 --- a/src/plugins/multimedia/gstreamer/qgstreamerintegration_p.h +++ b/src/plugins/multimedia/gstreamer/qgstreamerintegration_p.h @@ -31,17 +31,17 @@ public: static QGstreamerIntegration *instance() { return static_cast<QGstreamerIntegration *>(QPlatformMediaIntegration::instance()); } QPlatformMediaFormatInfo *formatInfo() override; - QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *decoder) override; - QPlatformMediaCaptureSession *createCaptureSession() override; - QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; - QPlatformCamera *createCamera(QCamera *) override; - QPlatformMediaRecorder *createRecorder(QMediaRecorder *) override; - QPlatformImageCapture *createImageCapture(QImageCapture *) override; + QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *decoder) override; + QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override; + QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *player) override; + QMaybe<QPlatformCamera *> createCamera(QCamera *) override; + QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *) override; + QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *) override; - QPlatformVideoSink *createVideoSink(QVideoSink *sink) override; + QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *sink) override; - QPlatformAudioInput *createAudioInput(QAudioInput *) override; - QPlatformAudioOutput *createAudioOutput(QAudioOutput *) override; + QMaybe<QPlatformAudioInput *> createAudioInput(QAudioInput *) override; + QMaybe<QPlatformAudioOutput *> createAudioOutput(QAudioOutput *) override; const QGstreamerFormatInfo *gstFormatsInfo() const; GstDevice *videoDevice(const QByteArray &id) const; diff --git a/src/plugins/multimedia/qnx/qqnxmediaintegration.cpp b/src/plugins/multimedia/qnx/qqnxmediaintegration.cpp index 05f63cc4c..0af18e95b 100644 --- a/src/plugins/multimedia/qnx/qqnxmediaintegration.cpp +++ b/src/plugins/multimedia/qnx/qqnxmediaintegration.cpp @@ -49,32 +49,32 @@ QPlatformMediaFormatInfo *QQnxMediaIntegration::formatInfo() return m_formatInfo; } -QPlatformVideoSink *QQnxMediaIntegration::createVideoSink(QVideoSink *sink) +QMaybe<QPlatformVideoSink *> QQnxMediaIntegration::createVideoSink(QVideoSink *sink) { return new QQnxVideoSink(sink); } -QPlatformMediaPlayer *QQnxMediaIntegration::createPlayer(QMediaPlayer *parent) +QMaybe<QPlatformMediaPlayer *> QQnxMediaIntegration::createPlayer(QMediaPlayer *parent) { return new QQnxMediaPlayer(parent); } -QPlatformMediaCaptureSession *QQnxMediaIntegration::createCaptureSession() +QMaybe<QPlatformMediaCaptureSession *> QQnxMediaIntegration::createCaptureSession() { return new QQnxMediaCaptureSession(); } -QPlatformMediaRecorder *QQnxMediaIntegration::createRecorder(QMediaRecorder *parent) +QMaybe<QPlatformMediaRecorder *> QQnxMediaIntegration::createRecorder(QMediaRecorder *parent) { return new QQnxMediaRecorder(parent); } -QPlatformCamera *QQnxMediaIntegration::createCamera(QCamera *parent) +QMaybe<QPlatformCamera *> QQnxMediaIntegration::createCamera(QCamera *parent) { return new QQnxPlatformCamera(parent); } -QPlatformImageCapture *QQnxMediaIntegration::createImageCapture(QImageCapture *parent) +QMaybe<QPlatformImageCapture *> QQnxMediaIntegration::createImageCapture(QImageCapture *parent) { return new QQnxImageCapture(parent); } diff --git a/src/plugins/multimedia/qnx/qqnxmediaintegration_p.h b/src/plugins/multimedia/qnx/qqnxmediaintegration_p.h index 7d185543d..1cb7c0219 100644 --- a/src/plugins/multimedia/qnx/qqnxmediaintegration_p.h +++ b/src/plugins/multimedia/qnx/qqnxmediaintegration_p.h @@ -30,17 +30,17 @@ public: QPlatformMediaFormatInfo *formatInfo() override; - QPlatformVideoSink *createVideoSink(QVideoSink *sink) override; + QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *sink) override; - QPlatformMediaPlayer *createPlayer(QMediaPlayer *parent) override; + QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *parent) override; - QPlatformMediaCaptureSession *createCaptureSession() override; + QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override; - QPlatformMediaRecorder *createRecorder(QMediaRecorder *parent) override; + QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *parent) override; - QPlatformCamera *createCamera(QCamera *parent) override; + QMaybe<QPlatformCamera *> createCamera(QCamera *parent) override; - QPlatformImageCapture *createImageCapture(QImageCapture *parent) override; + QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *parent) override; QQnxFormatInfo *m_formatInfo = nullptr; }; diff --git a/src/plugins/multimedia/windows/qwindowsintegration.cpp b/src/plugins/multimedia/windows/qwindowsintegration.cpp index 883eda6cf..7cb8dd908 100644 --- a/src/plugins/multimedia/windows/qwindowsintegration.cpp +++ b/src/plugins/multimedia/windows/qwindowsintegration.cpp @@ -56,37 +56,37 @@ QPlatformMediaFormatInfo *QWindowsMediaIntegration::formatInfo() return m_formatInfo; } -QPlatformMediaCaptureSession *QWindowsMediaIntegration::createCaptureSession() +QMaybe<QPlatformMediaCaptureSession *> QWindowsMediaIntegration::createCaptureSession() { return new QWindowsMediaCaptureService(); } -QPlatformAudioDecoder *QWindowsMediaIntegration::createAudioDecoder(QAudioDecoder *decoder) +QMaybe<QPlatformAudioDecoder *> QWindowsMediaIntegration::createAudioDecoder(QAudioDecoder *decoder) { return new MFAudioDecoderControl(decoder); } -QPlatformMediaPlayer *QWindowsMediaIntegration::createPlayer(QMediaPlayer *parent) +QMaybe<QPlatformMediaPlayer *> QWindowsMediaIntegration::createPlayer(QMediaPlayer *parent) { return new MFPlayerControl(parent); } -QPlatformCamera *QWindowsMediaIntegration::createCamera(QCamera *camera) +QMaybe<QPlatformCamera *> QWindowsMediaIntegration::createCamera(QCamera *camera) { return new QWindowsCamera(camera); } -QPlatformMediaRecorder *QWindowsMediaIntegration::createRecorder(QMediaRecorder *recorder) +QMaybe<QPlatformMediaRecorder *> QWindowsMediaIntegration::createRecorder(QMediaRecorder *recorder) { return new QWindowsMediaEncoder(recorder); } -QPlatformImageCapture *QWindowsMediaIntegration::createImageCapture(QImageCapture *imageCapture) +QMaybe<QPlatformImageCapture *> QWindowsMediaIntegration::createImageCapture(QImageCapture *imageCapture) { return new QWindowsImageCapture(imageCapture); } -QPlatformVideoSink *QWindowsMediaIntegration::createVideoSink(QVideoSink *sink) +QMaybe<QPlatformVideoSink *> QWindowsMediaIntegration::createVideoSink(QVideoSink *sink) { return new MFEvrVideoWindowControl(sink); } diff --git a/src/plugins/multimedia/windows/qwindowsintegration_p.h b/src/plugins/multimedia/windows/qwindowsintegration_p.h index 2ab9f82c4..81f5b4572 100644 --- a/src/plugins/multimedia/windows/qwindowsintegration_p.h +++ b/src/plugins/multimedia/windows/qwindowsintegration_p.h @@ -31,15 +31,15 @@ public: QPlatformMediaFormatInfo *formatInfo() override; - QPlatformMediaCaptureSession *createCaptureSession() override; + QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override; - QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *decoder) override; - QPlatformMediaPlayer *createPlayer(QMediaPlayer *parent) override; - QPlatformCamera *createCamera(QCamera *camera) override; - QPlatformMediaRecorder *createRecorder(QMediaRecorder *recorder) override; - QPlatformImageCapture *createImageCapture(QImageCapture *imageCapture) override; + QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *decoder) override; + QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *parent) override; + QMaybe<QPlatformCamera *> createCamera(QCamera *camera) override; + QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *recorder) override; + QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *imageCapture) override; - QPlatformVideoSink *createVideoSink(QVideoSink *sink) override; + QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *sink) override; QWindowsFormatInfo *m_formatInfo = nullptr; }; |