diff options
author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-09-09 15:55:48 +0200 |
---|---|---|
committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-10-06 09:44:58 +0200 |
commit | 5cc60401eef22ebfc9406d85c563db3f395d0c53 (patch) | |
tree | 3e84c43e7227d0480d5c5722ba6e1248edf25aa8 /src/plugins/multimedia/ffmpeg/qffmpegmediaintegration_p.h | |
parent | 9dd61fb5f5912444374450278d44e5b320e880c4 (diff) | |
download | qtmultimedia-5cc60401eef22ebfc9406d85c563db3f395d0c53.tar.gz |
Enable error reporting when failed to initialize backend element
This patch adds an option to report error message when a backend
component cannot be instantiated. This error message is then
displayed in the console with qWarning and in some cases reported
to the app user with error signals. We need further improvements
on the error reporting side.
Additionally, this patch cleans up the code in the .cpp API
classes.
Change-Id: Id39865cc8f1e9b52804bf5b9d9b15e738508f860
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit f1aa625049a08519d52ba87958e25cb80e47fd1e)
Diffstat (limited to 'src/plugins/multimedia/ffmpeg/qffmpegmediaintegration_p.h')
-rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpegmediaintegration_p.h | 17 |
1 files changed, 9 insertions, 8 deletions
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; |