diff options
Diffstat (limited to 'src/multimedia/platform')
5 files changed, 12 insertions, 4 deletions
diff --git a/src/multimedia/platform/qgstreamer_platformspecificinterface_p.h b/src/multimedia/platform/qgstreamer_platformspecificinterface_p.h index 94183efc8..1a086f5a4 100644 --- a/src/multimedia/platform/qgstreamer_platformspecificinterface_p.h +++ b/src/multimedia/platform/qgstreamer_platformspecificinterface_p.h @@ -17,6 +17,7 @@ #include <QtMultimedia/private/qplatformmediaintegration_p.h> typedef struct _GstPipeline GstPipeline; // NOLINT (bugprone-reserved-identifier) +typedef struct _GstElement GstElement; // NOLINT (bugprone-reserved-identifier) QT_BEGIN_NAMESPACE @@ -33,6 +34,9 @@ public: virtual QCamera *makeCustomGStreamerCamera(const QByteArray &gstreamerPipeline, QObject *parent) = 0; + // Note: ownership of GstElement is not transferred + virtual QCamera *makeCustomGStreamerCamera(GstElement *, QObject *parent) = 0; + virtual GstPipeline *gstPipeline(QMediaPlayer *) = 0; virtual GstPipeline *gstPipeline(QMediaCaptureSession *) = 0; }; diff --git a/src/multimedia/platform/qplatformaudiobufferinput_p.h b/src/multimedia/platform/qplatformaudiobufferinput_p.h index a05a98100..55636ce06 100644 --- a/src/multimedia/platform/qplatformaudiobufferinput_p.h +++ b/src/multimedia/platform/qplatformaudiobufferinput_p.h @@ -33,7 +33,7 @@ class Q_MULTIMEDIA_EXPORT QPlatformAudioBufferInput : public QPlatformAudioBuffe { Q_OBJECT public: - QPlatformAudioBufferInput(QAudioFormat format = {}) : m_format(std::move(format)) { } + QPlatformAudioBufferInput(const QAudioFormat &format = {}) : m_format(format) { } const QAudioFormat &audioFormat() const { return m_format; } diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp index 4bacc488f..b9aa1e258 100644 --- a/src/multimedia/platform/qplatformmediaintegration.cpp +++ b/src/multimedia/platform/qplatformmediaintegration.cpp @@ -33,7 +33,7 @@ public: } }; -static Q_LOGGING_CATEGORY(qLcMediaPlugin, "qt.multimedia.plugin") +Q_STATIC_LOGGING_CATEGORY(qLcMediaPlugin, "qt.multimedia.plugin") Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QPlatformMediaPlugin_iid, diff --git a/src/multimedia/platform/qplatformmediaplayer_p.h b/src/multimedia/platform/qplatformmediaplayer_p.h index 3f9d57677..f8815958b 100644 --- a/src/multimedia/platform/qplatformmediaplayer_p.h +++ b/src/multimedia/platform/qplatformmediaplayer_p.h @@ -65,12 +65,14 @@ public: virtual void setAudioOutput(QPlatformAudioOutput *) {} + virtual void setAudioBufferOutput(QAudioBufferOutput *) { } + virtual QMediaMetaData metaData() const { return {}; } virtual void setVideoSink(QVideoSink * /*sink*/) = 0; // media streams - enum TrackType { VideoStream, AudioStream, SubtitleStream, NTrackTypes }; + enum TrackType : uint8_t { VideoStream, AudioStream, SubtitleStream, NTrackTypes }; virtual int trackCount(TrackType) { return 0; }; virtual QMediaMetaData trackMetaData(TrackType /*type*/, int /*streamNumber*/) { return QMediaMetaData(); } @@ -118,7 +120,7 @@ public: bool doLoop() { return isSeekable() && (m_loops < 0 || ++m_currentLoop < m_loops); } - int loops() { return m_loops; } + int loops() const { return m_loops; } virtual void setLoops(int loops) { if (m_loops == loops) diff --git a/src/multimedia/platform/qplatformmediarecorder_p.h b/src/multimedia/platform/qplatformmediarecorder_p.h index dea45ac70..ab6af759d 100644 --- a/src/multimedia/platform/qplatformmediarecorder_p.h +++ b/src/multimedia/platform/qplatformmediarecorder_p.h @@ -130,6 +130,8 @@ public: QIODevice *outputDevice() const { return m_outputDevice; } void setOutputDevice(QIODevice *device) { m_outputDevice = device; } + virtual void updateAutoStop() { } + protected: explicit QPlatformMediaRecorder(QMediaRecorder *parent); |