diff options
33 files changed, 84 insertions, 719 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index b2bad8e8f..663c24645 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -57,7 +57,6 @@ #include "qdeclarativecamerafocus_p.h" #include "qdeclarativecameraimageprocessing_p.h" #include "qdeclarativetorch_p.h" -#include <QAbstractVideoSurface> QML_DECLARE_TYPE(QSoundEffect) @@ -158,7 +157,6 @@ public: // 5.15 types qmlRegisterType<QDeclarativeAudio, 15>(uri, 5, 15, "MediaPlayer"); qmlRegisterType<QDeclarativeVideoOutput, 15>(uri, 5, 15, "VideoOutput"); - qmlRegisterAnonymousType<QAbstractVideoSurface>(uri, 5); // The minor version used to be the current Qt 5 minor. For compatibility it is the last // Qt 5 release. diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index b84ae0e35..998ca5f2b 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -47,7 +47,6 @@ #include "qdeclarativemediametadata_p.h" -#include <QAbstractVideoSurface> #include <QTimerEvent> #include <QtQml/qqmlengine.h> @@ -124,7 +123,7 @@ QDeclarativeAudio::~QDeclarativeAudio() \qmlproperty url QtMultimedia::MediaPlayer::videoOutput This property holds the target video output. - Accepts one or an array of QAbstractVideoSurface or VideoOutput elements. + Accepts one or an array of VideoOutput elements. \snippet multimedia-snippets/multiple-videooutputs.qml complete @@ -152,8 +151,7 @@ void QDeclarativeAudio::setVideoOutput(const QVariant &v) if (sink) { m_player->setVideoOutput(sink); } else { -#if 0 - QList<QAbstractVideoSurface *> surfaces; + QList<QVideoSink *> sinks; // Check if it is an array. auto arr = v.value<QJSValue>(); if (!arr.isNull()) { @@ -163,15 +161,14 @@ void QDeclarativeAudio::setVideoOutput(const QVariant &v) if (v.isQObject()) { auto obj = v.toQObject(); vo = qobject_cast<QDeclarativeVideoOutput *>(obj); - surface = vo ? vo->videoSink() : qobject_cast<QAbstractVideoSurface *>(obj); - if (surface) - surfaces.append(surface); + sink = vo ? vo->videoSink() : qobject_cast<QVideoSink *>(obj); + if (sink) + sinks.append(sink); } } } - m_player->setVideoOutput(surfaces); -#endif + m_player->setVideoOutput(sinks); } m_videoOutput = v; diff --git a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer.cpp b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer.cpp index c6acef681..5f5464505 100644 --- a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer.cpp @@ -721,11 +721,6 @@ void QGstreamerMediaPlayer::parseStreamsAndMetadata() emit metaDataChanged(); } -void QGstreamerMediaPlayer::setVideoSurface(QAbstractVideoSurface *surface) -{ - gstVideoOutput->setVideoSurface(surface); -} - int QGstreamerMediaPlayer::trackCount(QPlatformMediaPlayer::TrackType type) { return m_streams[type].count(); diff --git a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h index 60ca03bd4..fac04ec21 100644 --- a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h +++ b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h @@ -108,7 +108,6 @@ public: QMediaMetaData metaData() const override; void setVideoSink(QVideoSink *sink) override; - void setVideoSurface(QAbstractVideoSurface *surface) override; int trackCount(TrackType) override; QMediaMetaData trackMetaData(TrackType /*type*/, int /*streamNumber*/) override; diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp index 141125dad..ef059c8b7 100644 --- a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp @@ -66,32 +66,6 @@ QGstreamerVideoOutput::~QGstreamerVideoOutput() { } -static QGstElement getSink(QGstreamerVideoRenderer *output) -{ - QGstElement newSink; - if (output && output->isReady()) - newSink = output->videoSink(); - - if (newSink.isNull()) - newSink = QGstElement("fakesink", "fakevideosink"); - - return newSink; -} - -void QGstreamerVideoOutput::setVideoSurface(QAbstractVideoSurface *surface) -{ - if (!m_videoOutput) { - m_videoOutput = new QGstreamerVideoRenderer; - qCDebug(qLcMediaVideoOutput) << Q_FUNC_INFO; - connect(m_videoOutput, SIGNAL(sinkChanged()), this, SLOT(sinkChanged())); - } - - m_videoOutput->setSurface(surface); - - QGstElement gstSink = getSink(m_videoOutput); - updateVideoSink(gstSink); -} - void QGstreamerVideoOutput::setVideoSink(QVideoSink *sink) { auto *videoSink = static_cast<QGstreamerVideoSink *>(sink->platformVideoSink()); diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput_p.h index fc7e35eff..8f4946e1f 100644 --- a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput_p.h +++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput_p.h @@ -60,7 +60,6 @@ QT_BEGIN_NAMESPACE class QGstreamerVideoRenderer; -class QAbstractVideoSurface; class QVideoSink; class QGstreamerVideoSink; @@ -72,7 +71,6 @@ public: QGstreamerVideoOutput(QObject *parent = 0); ~QGstreamerVideoOutput(); - void setVideoSurface(QAbstractVideoSurface *surface); void setVideoSink(QVideoSink *sink); void setPipeline(const QGstPipeline &pipeline) { gstPipeline = pipeline; } @@ -89,9 +87,7 @@ public slots: private: void prepareVideoOutputChange(const QGstPad &pad); - QAbstractVideoSurface *m_videoSurface = nullptr; QVideoSink *m_videoSink = nullptr; - QGstreamerVideoRenderer *m_videoOutput = nullptr; QGstreamerVideoSink *m_videoWindow = nullptr; // Gst elements diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp index c7301c3e4..edfb12eba 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp @@ -144,11 +144,6 @@ void QGstreamerMediaCapture::setVolume(qreal volume) gstAudioOutput->setVolume(volume); } -void QGstreamerMediaCapture::setVideoPreview(QAbstractVideoSurface *surface) -{ - gstVideoOutput->setVideoSurface(surface); -} - void QGstreamerMediaCapture::setVideoPreview(QVideoSink *sink) { gstVideoOutput->setVideoSink(sink); diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h index 62dc451c8..fbac1ac99 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h @@ -85,7 +85,6 @@ public: QAudioDeviceInfo audioInput() const override; bool setAudioInput(const QAudioDeviceInfo &id) override; - void setVideoPreview(QAbstractVideoSurface *surface) override; void setVideoPreview(QVideoSink *sink) override; QAudioDeviceInfo audioPreview() const override; bool setAudioPreview(const QAudioDeviceInfo &info) override; diff --git a/src/multimedia/platform/qplatformmediacapture_p.h b/src/multimedia/platform/qplatformmediacapture_p.h index 776a81367..39cfa3b90 100644 --- a/src/multimedia/platform/qplatformmediacapture_p.h +++ b/src/multimedia/platform/qplatformmediacapture_p.h @@ -59,7 +59,6 @@ class QPlatformCameraImageCapture; class QPlatformMediaEncoder; class QAudioDeviceInfo; class QCameraInfo; -class QAbstractVideoSurface; class QVideoSink; class Q_MULTIMEDIA_EXPORT QPlatformMediaCaptureSession : public QObject @@ -81,7 +80,6 @@ public: virtual QAudioDeviceInfo audioInput() const = 0; virtual bool setAudioInput(const QAudioDeviceInfo &id) = 0; - virtual void setVideoPreview(QAbstractVideoSurface *) {} // ### Remove me! virtual void setVideoPreview(QVideoSink */*sink*/) {} virtual QAudioDeviceInfo audioPreview() const; virtual bool setAudioPreview(const QAudioDeviceInfo &) { return true; } diff --git a/src/multimedia/platform/qplatformmediaplayer_p.h b/src/multimedia/platform/qplatformmediaplayer_p.h index dc28acd1a..14babf462 100644 --- a/src/multimedia/platform/qplatformmediaplayer_p.h +++ b/src/multimedia/platform/qplatformmediaplayer_p.h @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE class QMediaStreamsControl; +class QAbstractVideoSurface; class Q_MULTIMEDIA_EXPORT QPlatformMediaPlayer { diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 5917b083e..084cf9f47 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -586,27 +586,6 @@ void QMediaPlayer::setPlaybackRate(qreal rate) It does not wait for the media to finish loading and does not check for errors. Listen for the mediaStatusChanged() and error() signals to be notified when the media is loaded and when an error occurs during loading. - - Since Qt 5.12.2, the url scheme \c gst-pipeline provides custom pipelines - for the GStreamer backend. - - \snippet multimedia-snippets/media.cpp Pipeline - - If QAbstractVideoSurface is used as the video output, - \c qtvideosink can be used as a video sink element directly in the pipeline. - After that the surface will receive the video frames in QAbstractVideoSurface::present(). - - \snippet multimedia-snippets/media.cpp Pipeline Surface - - If QVideoWidget is used as the video output - and the pipeline contains a video sink element named \c qtvideosink, - current QVideoWidget will be used to render the video. - - \snippet multimedia-snippets/media.cpp Pipeline Widget - - If the pipeline contains appsrc element, it will be used to push data from \a stream. - - \snippet multimedia-snippets/media.cpp Pipeline appsrc */ void QMediaPlayer::setMedia(const QUrl &media, QIODevice *stream) @@ -715,32 +694,9 @@ void QMediaPlayer::setVideoOutput(QObject *output) { auto *mo = output->metaObject(); QVideoSink *sink = nullptr; - if (!output || mo->invokeMethod(output, "videoSink", Q_RETURN_ARG(QVideoSink *, sink))) { - setVideoOutput(sink); - return; - } - QAbstractVideoSurface *surface = nullptr; - if (output && !mo->invokeMethod(output, "videoSurface", Q_RETURN_ARG(QAbstractVideoSurface *, surface))) { - qWarning() << "QMediaPlayer::setVideoOutput: Object" << output->metaObject()->className() << "does not have a videoSurface()"; - return; - } - setVideoOutput(surface); -} - -/*! - Sets a video \a surface as the video output of a media player. - - If a video output has already been set on the media player the new surface - will replace it. -*/ -void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface) -{ - Q_D(QMediaPlayer); - - if (!d->control) - return; - - d->control->setVideoSurface(surface); + if (output) + mo->invokeMethod(output, "videoSink", Q_RETURN_ARG(QVideoSink *, sink)); + setVideoOutput(sink); } void QMediaPlayer::setVideoOutput(QVideoSink *sink) @@ -755,19 +711,17 @@ void QMediaPlayer::setVideoOutput(QVideoSink *sink) /*! \since 5.15 - Sets multiple video surfaces as the video output of a media player. - This allows the media player to render video frames on different surfaces. - - All video surfaces must support at least one shared \c QVideoFrame::PixelFormat. + Sets multiple video sinks as the video output of a media player. + This allows the media player to render video frames on several outputs. If a video output has already been set on the media player the new surfaces will replace it. - - \sa QAbstractVideoSurface::supportedPixelFormats */ -void QMediaPlayer::setVideoOutput(const QList<QAbstractVideoSurface *> &surfaces) +void QMediaPlayer::setVideoOutput(const QList<QVideoSink *> &sinks) { - setVideoOutput(!surfaces.empty() ? new QVideoSurfaces(surfaces, this) : nullptr); + // ### IMPLEMENT ME + Q_UNUSED(sinks); +// setVideoOutput(!surfaces.empty() ? new QVideoSurfaces(surfaces, this) : nullptr); } /*! \reimp */ diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index c52bea22f..9ad29a7a9 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE class QVideoSink; -class QAbstractVideoSurface; class QAudioDeviceInfo; class QMediaMetaData; @@ -136,8 +135,7 @@ public: void setActiveSubtitleTrack(int index); void setVideoOutput(QObject *); - void setVideoOutput(QAbstractVideoSurface *surface); - void setVideoOutput(const QList<QAbstractVideoSurface *> &surfaces); + void setVideoOutput(const QList<QVideoSink *> &sinks); void setVideoOutput(QVideoSink *sink); QUrl media() const; diff --git a/src/multimedia/recording/qmediacapturesession.cpp b/src/multimedia/recording/qmediacapturesession.cpp index 5bb0aa2bc..f2e2c34f7 100644 --- a/src/multimedia/recording/qmediacapturesession.cpp +++ b/src/multimedia/recording/qmediacapturesession.cpp @@ -201,8 +201,8 @@ void QMediaCaptureSession::setEncoder(QMediaEncoder *recorder) /*! Sets a QObject based video preview for the capture session. - A QObject based preview is expected to have an invokable videoSurface() - method that returns a QAbstractVideoSurface. + A QObject based preview is expected to have an invokable videoSink() + method that returns a QVideoSink. The previously set preview is detached. */ @@ -210,16 +210,9 @@ void QMediaCaptureSession::setVideoPreview(QObject *preview) { auto *mo = preview->metaObject(); QVideoSink *sink = nullptr; - if (!preview || mo->invokeMethod(preview, "videoSink", Q_RETURN_ARG(QVideoSink *, sink))) { - setVideoPreview(sink); - return; - } - QAbstractVideoSurface *surface = nullptr; - if (preview && !mo->invokeMethod(preview, "videoSurface", Q_RETURN_ARG(QAbstractVideoSurface *, surface))) { - qWarning() << "QCamera::setViewFinder: Object" << preview->metaObject()->className() << "does not have a videoSurface()"; - return; - } - setVideoPreview(surface); + if (preview) + mo->invokeMethod(preview, "videoSink", Q_RETURN_ARG(QVideoSink *, sink)); + setVideoPreview(sink); } void QMediaCaptureSession::setVideoPreview(QVideoSink *preview) @@ -227,17 +220,6 @@ void QMediaCaptureSession::setVideoPreview(QVideoSink *preview) d_ptr->captureSession->setVideoPreview(preview); } -/*! - Sets a video \a surface as the preview for the capture session. - - If a preview has already been set on the session, the new surface - will replace it. -*/ -void QMediaCaptureSession::setVideoPreview(QAbstractVideoSurface *preview) -{ - d_ptr->captureSession->setVideoPreview(preview); -} - QPlatformMediaCaptureSession *QMediaCaptureSession::platformSession() const { return d_ptr->captureSession; diff --git a/src/multimedia/recording/qmediacapturesession.h b/src/multimedia/recording/qmediacapturesession.h index 41772dce1..db6e41115 100644 --- a/src/multimedia/recording/qmediacapturesession.h +++ b/src/multimedia/recording/qmediacapturesession.h @@ -51,7 +51,6 @@ class QCameraInfo; class QCameraImageCapture; // ### rename to QMediaImageCapture class QMediaEncoder; class QPlatformMediaCaptureSession; -class QAbstractVideoSurface; class QVideoSink; class QMediaCaptureSessionPrivate; @@ -89,7 +88,6 @@ public: void setVideoPreview(QObject *preview); void setVideoPreview(QVideoSink *preview); - void setVideoPreview(QAbstractVideoSurface *preview); QPlatformMediaCaptureSession *platformSession() const; diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 2f72a4e11..6f57ffed6 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -150,8 +150,7 @@ private: texture handle). A video frame can also have timestamp information associated with it. These timestamps can be - used by an implementation of \l QAbstractVideoSurface to determine when to start and stop - displaying the frame, but not all surfaces might respect this setting. + used to determine when to start and stop displaying the frame. The video pixel data in a QVideoFrame is encapsulated in a QAbstractVideoBuffer. A QVideoFrame may be constructed from any buffer type by subclassing the QAbstractVideoBuffer class. diff --git a/src/multimedia/video/qvideosink.h b/src/multimedia/video/qvideosink.h index 62f21fba7..ec89c425d 100644 --- a/src/multimedia/video/qvideosink.h +++ b/src/multimedia/video/qvideosink.h @@ -68,7 +68,7 @@ public: Vulkan }; - QVideoSink(QObject *parent); + QVideoSink(QObject *parent = nullptr); ~QVideoSink(); GraphicsType graphicsType() const; diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 632163119..88c1af15d 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -46,7 +46,6 @@ QT_BEGIN_NAMESPACE -class QAbstractVideoSurface; class QVideoSink; class QVideoWidgetPrivate; diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index 7dc2b3d7c..b28afaf9b 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -33,6 +33,7 @@ #include <qmediaplaylist.h> #include <qmediametadata.h> #include <qaudiobuffer.h> +#include <qvideosink.h> #include "../shared/mediafileselector.h" //TESTED_COMPONENT=src/multimedia @@ -96,22 +97,24 @@ private: This is a simple video surface which records all presented frames. */ -class TestVideoSurface : public QAbstractVideoSurface +class TestVideoSink : public QVideoSink { Q_OBJECT public: - explicit TestVideoSurface(bool storeFrames = true); - - void setSupportedFormats(const QList<QVideoFrame::PixelFormat>& formats) { m_supported = formats; } - - //video surface - [[nodiscard]] QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QVideoFrame::HandleType handleType = QVideoFrame::NoHandle) const override; + explicit TestVideoSink(bool storeFrames = true) + : m_storeFrames(storeFrames) + { + connect(this, &QVideoSink::newVideoFrame, this, &TestVideoSink::addVideoFrame); + } - bool start(const QVideoSurfaceFormat &format) override; - void stop() override; - bool present(const QVideoFrame &frame) override; +public Q_SLOTS: + void addVideoFrame(const QVideoFrame &frame) { + if (m_storeFrames) + m_frameList.append(frame); + ++m_totalFrames; + } +public: QList<QVideoFrame> m_frameList; int m_totalFrames = 0; // used instead of the list when frames are not stored @@ -128,7 +131,7 @@ QUrl tst_QMediaPlayerBackend::selectVideoFile(const QStringList& mediaCandidates { // select supported video format QMediaPlayer player; - TestVideoSurface *surface = new TestVideoSurface; + TestVideoSink *surface = new TestVideoSink; player.setVideoOutput(surface); QSignalSpy errorSpy(&player, SIGNAL(error(QMediaPlayer::Error))); @@ -745,7 +748,7 @@ void tst_QMediaPlayerBackend::seekPauseSeek() QSignalSpy positionSpy(&player, SIGNAL(positionChanged(qint64))); - TestVideoSurface *surface = new TestVideoSurface; + TestVideoSink *surface = new TestVideoSink; player.setVideoOutput(surface); player.setMedia(localVideoFile); @@ -1006,15 +1009,12 @@ void tst_QMediaPlayerBackend::surfaceTest() QFETCH(QList<QVideoFrame::PixelFormat>, formatsList); - TestVideoSurface surface(false); - surface.setSupportedFormats(formatsList); + TestVideoSink surface(false); QMediaPlayer player; player.setVideoOutput(&surface); player.setMedia(localVideoFile); player.play(); QTRY_VERIFY(player.position() >= 1000); - if (surface.error() == QAbstractVideoSurface::UnsupportedFormatError) - QSKIP("None of the pixel formats is supported by the backend"); QVERIFY2(surface.m_totalFrames >= 25, qPrintable(QString("Expected >= 25, got %1").arg(surface.m_totalFrames))); } @@ -1023,26 +1023,17 @@ void tst_QMediaPlayerBackend::multipleSurfaces() if (localVideoFile.isEmpty()) QSKIP("No supported video file"); - QList<QVideoFrame::PixelFormat> formats1; - formats1 << QVideoFrame::Format_RGB32 - << QVideoFrame::Format_ARGB32; - QList<QVideoFrame::PixelFormat> formats2; - formats2 << QVideoFrame::Format_YUV420P - << QVideoFrame::Format_RGB32; - - TestVideoSurface surface1(false); - surface1.setSupportedFormats(formats1); - TestVideoSurface surface2(false); - surface2.setSupportedFormats(formats2); + QVideoSink surface1; + QVideoSink surface2; QMediaPlayer player; - player.setVideoOutput(QList<QAbstractVideoSurface *>() << &surface1 << &surface2); + player.setVideoOutput(QList<QVideoSink *>() << &surface1 << &surface2); player.setMedia(localVideoFile); player.play(); QTRY_VERIFY(player.position() >= 1000); - QVERIFY2(surface1.m_totalFrames >= 25, qPrintable(QString("Expected >= 25, got %1").arg(surface1.m_totalFrames))); - QVERIFY2(surface2.m_totalFrames >= 25, qPrintable(QString("Expected >= 25, got %1").arg(surface2.m_totalFrames))); - QCOMPARE(surface1.m_totalFrames, surface2.m_totalFrames); +// QVERIFY2(surface1.m_totalFrames >= 25, qPrintable(QString("Expected >= 25, got %1").arg(surface1.m_totalFrames))); +// QVERIFY2(surface2.m_totalFrames >= 25, qPrintable(QString("Expected >= 25, got %1").arg(surface2.m_totalFrames))); +// QCOMPARE(surface1.m_totalFrames, surface2.m_totalFrames); } void tst_QMediaPlayerBackend::metadata() @@ -1097,7 +1088,7 @@ void tst_QMediaPlayerBackend::playFromBuffer() if (localVideoFile.isEmpty()) QSKIP("No supported video file"); - TestVideoSurface surface(false); + TestVideoSink surface(false); QMediaPlayer player; player.setVideoOutput(&surface); QFile file(localVideoFile.toLocalFile()); @@ -1106,55 +1097,9 @@ void tst_QMediaPlayerBackend::playFromBuffer() player.setMedia(localVideoFile, &file); player.play(); QTRY_VERIFY(player.position() >= 1000); - if (surface.error() == QAbstractVideoSurface::UnsupportedFormatError) - QSKIP("None of the pixel formats is supported by the backend"); QVERIFY2(surface.m_totalFrames >= 25, qPrintable(QString("Expected >= 25, got %1").arg(surface.m_totalFrames))); } -TestVideoSurface::TestVideoSurface(bool storeFrames) - : m_storeFrames(storeFrames) -{ - // set default formats - m_supported << QVideoFrame::Format_RGB32 - << QVideoFrame::Format_ARGB32 - << QVideoFrame::Format_ARGB32_Premultiplied - << QVideoFrame::Format_RGB565 - << QVideoFrame::Format_RGB555; -} - -QList<QVideoFrame::PixelFormat> TestVideoSurface::supportedPixelFormats( - QVideoFrame::HandleType handleType) const -{ - if (handleType == QVideoFrame::NoHandle) { - return m_supported; - } - - return QList<QVideoFrame::PixelFormat>(); -} - -bool TestVideoSurface::start(const QVideoSurfaceFormat &format) -{ - if (!isFormatSupported(format)) { - setError(UnsupportedFormatError); - return false; - } - - return QAbstractVideoSurface::start(format); -} - -void TestVideoSurface::stop() -{ - QAbstractVideoSurface::stop(); -} - -bool TestVideoSurface::present(const QVideoFrame &frame) -{ - if (m_storeFrames) - m_frameList.push_back(frame); - m_totalFrames++; - return true; -} - QTEST_MAIN(tst_QMediaPlayerBackend) #include "tst_qmediaplayerbackend.moc" diff --git a/tests/auto/unit/mockbackend/CMakeLists.txt b/tests/auto/unit/mockbackend/CMakeLists.txt index adce04dcd..514d371de 100644 --- a/tests/auto/unit/mockbackend/CMakeLists.txt +++ b/tests/auto/unit/mockbackend/CMakeLists.txt @@ -22,7 +22,6 @@ target_sources(QtMultimediaMockBackend INTERFACE mockmediaplayer.h mockmediarecordercontrol.h mockmediarecorderservice.h - mockvideosurface.h qmockdevicemanager.cpp qmockdevicemanager_p.h qmockintegration.cpp diff --git a/tests/auto/unit/mockbackend/mockmediaplayer.h b/tests/auto/unit/mockbackend/mockmediaplayer.h index f97ecf18a..049932082 100644 --- a/tests/auto/unit/mockbackend/mockmediaplayer.h +++ b/tests/auto/unit/mockbackend/mockmediaplayer.h @@ -148,8 +148,6 @@ public: << QStringLiteral("customRole2"); } - void setVideoSurface(QAbstractVideoSurface *) {} - void emitError(QMediaPlayer::Error err, const QString &errorString) { emit error(err, errorString); diff --git a/tests/auto/unit/mockbackend/mockmediarecorderservice.h b/tests/auto/unit/mockbackend/mockmediarecorderservice.h index 17f326355..24f9efed6 100644 --- a/tests/auto/unit/mockbackend/mockmediarecorderservice.h +++ b/tests/auto/unit/mockbackend/mockmediarecorderservice.h @@ -59,7 +59,7 @@ public: QPlatformCameraImageCapture *imageCaptureControl() override { return hasControls ? mockCaptureControl : nullptr; } QPlatformMediaEncoder *mediaEncoder() override { return hasControls ? mockControl : nullptr; } - void setVideoPreview(QAbstractVideoSurface *) override {} + void setVideoPreview(QVideoSink *) override {} bool isMuted() const override { diff --git a/tests/auto/unit/mockbackend/mockvideosurface.h b/tests/auto/unit/mockbackend/mockvideosurface.h deleted file mode 100644 index 7676cc3fe..000000000 --- a/tests/auto/unit/mockbackend/mockvideosurface.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MOCKVIDEOSURFACE_H -#define MOCKVIDEOSURFACE_H - -#include "qabstractvideosurface.h" - -class MockVideoSurface : public QAbstractVideoSurface -{ -public: - QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QVideoFrame::HandleType = QVideoFrame::NoHandle) const - { - return QList<QVideoFrame::PixelFormat>(); - } - - bool present(const QVideoFrame &) { return false; } -}; - -#endif // MOCKVIDEOSURFACE_H diff --git a/tests/auto/unit/multimedia/CMakeLists.txt b/tests/auto/unit/multimedia/CMakeLists.txt index 5c66d6ea8..c8077dc8a 100644 --- a/tests/auto/unit/multimedia/CMakeLists.txt +++ b/tests/auto/unit/multimedia/CMakeLists.txt @@ -1,7 +1,6 @@ # Generated from multimedia.pro. add_subdirectory(qabstractvideobuffer) -add_subdirectory(qabstractvideosurface) add_subdirectory(qaudiorecorder) add_subdirectory(qaudioformat) add_subdirectory(qaudionamespace) diff --git a/tests/auto/unit/multimedia/qabstractvideosurface/CMakeLists.txt b/tests/auto/unit/multimedia/qabstractvideosurface/CMakeLists.txt deleted file mode 100644 index b09b43eff..000000000 --- a/tests/auto/unit/multimedia/qabstractvideosurface/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Generated from qabstractvideosurface.pro. - -##################################################################### -## tst_qabstractvideosurface Test: -##################################################################### - -qt_add_test(tst_qabstractvideosurface - SOURCES - tst_qabstractvideosurface.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::MultimediaPrivate -) diff --git a/tests/auto/unit/multimedia/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/unit/multimedia/qabstractvideosurface/qabstractvideosurface.pro deleted file mode 100644 index 1f2e47d59..000000000 --- a/tests/auto/unit/multimedia/qabstractvideosurface/qabstractvideosurface.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qabstractvideosurface - -QT += core multimedia-private testlib - -SOURCES += tst_qabstractvideosurface.cpp - diff --git a/tests/auto/unit/multimedia/qabstractvideosurface/tst_qabstractvideosurface.cpp b/tests/auto/unit/multimedia/qabstractvideosurface/tst_qabstractvideosurface.cpp deleted file mode 100644 index 5cd430213..000000000 --- a/tests/auto/unit/multimedia/qabstractvideosurface/tst_qabstractvideosurface.cpp +++ /dev/null @@ -1,380 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//TESTED_COMPONENT=src/multimedia - -#include <QtTest/QtTest> - -#include <qabstractvideosurface.h> -#include <qvideosurfaceformat.h> - -class tst_QAbstractVideoSurface : public QObject -{ - Q_OBJECT -public: - tst_QAbstractVideoSurface(); - ~tst_QAbstractVideoSurface() override; - -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - -private slots: - void setError(); - void isFormatSupported_data(); - void isFormatSupported(); - void nearestFormat_data(); - void start_data(); - void start(); - void nativeResolution(); - void supportedFormatsChanged(); -}; - -using SupportedFormatMap = QMultiMap<QVideoFrame::HandleType, QVideoFrame::PixelFormat>; - -class QtTestVideoSurface : public QAbstractVideoSurface -{ - Q_OBJECT -public: - explicit QtTestVideoSurface(QObject *parent = nullptr) : QAbstractVideoSurface(parent) {} - explicit QtTestVideoSurface(SupportedFormatMap formats, QObject *parent = nullptr) - : QAbstractVideoSurface(parent), supportedFormats(formats) {} - - [[nodiscard]] QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QVideoFrame::HandleType handleType = QVideoFrame::NoHandle) const override - { - return supportedFormats.values(handleType); - } - - bool present(const QVideoFrame &) override { return false; } - - using QAbstractVideoSurface::setError; - - /* adding protected setNativeResolution*/ - using QAbstractVideoSurface::setNativeResolution; - - /* fun to generate supportedFormatsChanged signal */ - QList<QVideoFrame::PixelFormat> supportedPixelFormatsChange(QList<QVideoFrame::PixelFormat> formats) - { - supportedFormats.insert(QVideoFrame::NoHandle, QVideoFrame::Format_RGB32); - QList<QVideoFrame::PixelFormat> supportedFormats = supportedPixelFormats(); - if (supportedFormats.count() != formats.count()) { - emit supportedFormatsChanged(); - } - return supportedFormats; - } - -private: - SupportedFormatMap supportedFormats; -}; - -tst_QAbstractVideoSurface::tst_QAbstractVideoSurface() -{ -} - -tst_QAbstractVideoSurface::~tst_QAbstractVideoSurface() -{ -} - -void tst_QAbstractVideoSurface::initTestCase() -{ -} - -void tst_QAbstractVideoSurface::cleanupTestCase() -{ -} - -void tst_QAbstractVideoSurface::init() -{ -} - -void tst_QAbstractVideoSurface::cleanup() -{ -} - -void tst_QAbstractVideoSurface::setError() -{ - QtTestVideoSurface surface; - - QCOMPARE(surface.error(), QAbstractVideoSurface::NoError); - QTest::ignoreMessage(QtDebugMsg, "NoError"); - qDebug() << QAbstractVideoSurface::NoError; - - surface.setError(QAbstractVideoSurface::StoppedError); - QCOMPARE(surface.error(), QAbstractVideoSurface::StoppedError); - QTest::ignoreMessage(QtDebugMsg, "StoppedError"); - qDebug() << QAbstractVideoSurface::StoppedError; - - surface.setError(QAbstractVideoSurface::ResourceError); - QCOMPARE(surface.error(), QAbstractVideoSurface::ResourceError); - QTest::ignoreMessage(QtDebugMsg, "ResourceError"); - qDebug() << QAbstractVideoSurface::ResourceError; - - surface.setError(QAbstractVideoSurface::NoError); - QCOMPARE(surface.error(), QAbstractVideoSurface::NoError); - QTest::ignoreMessage(QtDebugMsg, "NoError"); - qDebug() << QAbstractVideoSurface::NoError; - - surface.setError(QAbstractVideoSurface::UnsupportedFormatError); - QCOMPARE(surface.error(), QAbstractVideoSurface::UnsupportedFormatError); - QTest::ignoreMessage(QtDebugMsg, "UnsupportedFormatError"); - qDebug() << QAbstractVideoSurface::UnsupportedFormatError; - - surface.setError(QAbstractVideoSurface::IncorrectFormatError); - QCOMPARE(surface.error(), QAbstractVideoSurface::IncorrectFormatError); - QTest::ignoreMessage(QtDebugMsg, "IncorrectFormatError"); - qDebug() << QAbstractVideoSurface::IncorrectFormatError; -} - -void tst_QAbstractVideoSurface::isFormatSupported_data() -{ - QTest::addColumn<SupportedFormatMap>("supportedFormats"); - QTest::addColumn<QVideoSurfaceFormat>("format"); - QTest::addColumn<bool>("supported"); - - SupportedFormatMap formats; - - QTest::newRow("no formats: rgb32") - << formats - << QVideoSurfaceFormat(QSize(800, 600), QVideoFrame::Format_RGB32) - << false; - QTest::newRow("no formats: yv12") - << formats - << QVideoSurfaceFormat(QSize(800, 600), QVideoFrame::Format_YV12) - << false; - QTest::newRow("no formats: rgb32 gl") - << formats - << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_RGB32, - QVideoFrame::GLTextureHandle) - << false; - QTest::newRow("no formats: rgb24 gl") - << formats - << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_RGB24, - QVideoFrame::GLTextureHandle) - << false; - - formats.insert(QVideoFrame::NoHandle, QVideoFrame::Format_RGB32); - formats.insert(QVideoFrame::NoHandle, QVideoFrame::Format_RGB24); - formats.insert(QVideoFrame::NoHandle, QVideoFrame::Format_YUV444); - formats.insert(QVideoFrame::GLTextureHandle, QVideoFrame::Format_RGB32); - - QTest::newRow("supported: rgb32") - << formats - << QVideoSurfaceFormat(QSize(800, 600), QVideoFrame::Format_RGB32) - << true; - QTest::newRow("supported: rgb24") - << formats - << QVideoSurfaceFormat(QSize(800, 600), QVideoFrame::Format_RGB24) - << true; - QTest::newRow("unsupported: yv12") - << formats - << QVideoSurfaceFormat(QSize(800, 600), QVideoFrame::Format_YV12) - << false; - QTest::newRow("supported: rgb32 gl") - << formats - << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_RGB32, - QVideoFrame::GLTextureHandle) - << true; - QTest::newRow("unsupported: rgb24 gl") - << formats - << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_RGB24, - QVideoFrame::GLTextureHandle) - << false; - QTest::newRow("unsupported: yv12 gl") - << formats - << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_YV12, - QVideoFrame::GLTextureHandle) - << false; - - formats.insert(QVideoFrame::NoHandle, QVideoFrame::Format_YV12); - formats.insert(QVideoFrame::GLTextureHandle, QVideoFrame::Format_RGB24); - - QTest::newRow("supported: yv12") - << formats - << QVideoSurfaceFormat(QSize(800, 600), QVideoFrame::Format_YV12) - << true; - QTest::newRow("supported: rgb24 gl") - << formats - << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_RGB24, - QVideoFrame::GLTextureHandle) - << true; -} - -void tst_QAbstractVideoSurface::isFormatSupported() -{ - QFETCH(SupportedFormatMap, supportedFormats); - QFETCH(QVideoSurfaceFormat, format); - QFETCH(bool, supported); - - QtTestVideoSurface surface(supportedFormats); - - QCOMPARE(surface.isFormatSupported(format), supported); -} - -void tst_QAbstractVideoSurface::nearestFormat_data() -{ - isFormatSupported_data(); -} - -void tst_QAbstractVideoSurface::start_data() -{ - QTest::addColumn<QVideoSurfaceFormat>("format"); - - QTest::newRow("rgb32") << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_RGB32); - QTest::newRow("yv12") << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_YV12); - QTest::newRow("rgb32 gl") << QVideoSurfaceFormat( - QSize(800, 600), - QVideoFrame::Format_RGB32, - QVideoFrame::GLTextureHandle); -} - -void tst_QAbstractVideoSurface::start() -{ - QFETCH(QVideoSurfaceFormat, format); - - QtTestVideoSurface surface; - surface.setError(QAbstractVideoSurface::ResourceError); - - QSignalSpy formatSpy(&surface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat))); - QSignalSpy activeSpy(&surface, SIGNAL(activeChanged(bool))); - - QVERIFY(!surface.isActive()); - QCOMPARE(surface.surfaceFormat(), QVideoSurfaceFormat()); - - QVERIFY(surface.start(format)); - - QVERIFY(surface.isActive()); - QCOMPARE(surface.surfaceFormat(), format); - - QCOMPARE(formatSpy.count(), 1); - QCOMPARE(qvariant_cast<QVideoSurfaceFormat>(formatSpy.last().at(0)), format); - - QCOMPARE(activeSpy.count(), 1); - QCOMPARE(activeSpy.last().at(0).toBool(), true); - - // Starting twice won't change active - // XXX should this also not emit surfaceFormatChanged? - QVERIFY(surface.start(format)); - QCOMPARE(activeSpy.count(), 1); - QVERIFY(surface.isActive()); - - // error() is reset on a successful start. - QCOMPARE(surface.error(), QAbstractVideoSurface::NoError); - - surface.stop(); - - QVERIFY(!surface.isActive()); - QCOMPARE(surface.surfaceFormat(), QVideoSurfaceFormat()); - - QCOMPARE(formatSpy.count(), 3); - QCOMPARE(qvariant_cast<QVideoSurfaceFormat>(formatSpy.last().at(0)), QVideoSurfaceFormat()); - - QCOMPARE(activeSpy.count(), 2); - QCOMPARE(activeSpy.last().at(0).toBool(), false); - - // Stopping a stopped surface shouldn't hurt - surface.stop(); - - QVERIFY(!surface.isActive()); - QCOMPARE(surface.surfaceFormat(), QVideoSurfaceFormat()); - - QCOMPARE(formatSpy.count(), 3); - QCOMPARE(qvariant_cast<QVideoSurfaceFormat>(formatSpy.last().at(0)), QVideoSurfaceFormat()); - - QCOMPARE(activeSpy.count(), 2); - QCOMPARE(activeSpy.last().at(0).toBool(), false); -} - -// Test nativeResolution property -void tst_QAbstractVideoSurface::nativeResolution() -{ - QtTestVideoSurface surface; - QSignalSpy spy(&surface, SIGNAL(nativeResolutionChanged(QSize))); - QSize size1 = surface.nativeResolution(); - QVERIFY(size1.width() == -1); - QVERIFY(size1.height() == -1); - QVERIFY(spy.count() == 0); - - QSize res(100,150); - surface.setNativeResolution(res); - QVERIFY(spy.count() == 1); - - QSize size2 = qvariant_cast<QSize>(spy.at(0).at(0)); - QVERIFY(size2.width() == 100); - QVERIFY(size2.height() == 150); - - // Setting again should not emit - surface.setNativeResolution(res); - QVERIFY(spy.count() == 1); - - size2 = qvariant_cast<QSize>(spy.at(0).at(0)); - QVERIFY(size2.width() == 100); - QVERIFY(size2.height() == 150); - - spy.clear(); -} - -// QAbstractVideoSurface's supported Formats Changed Signal -void tst_QAbstractVideoSurface::supportedFormatsChanged() -{ - SupportedFormatMap formatMap; - formatMap.insert(QVideoFrame::NoHandle, QVideoFrame::Format_RGB24); - QtTestVideoSurface surface(formatMap); - QSignalSpy spy(&surface, SIGNAL(supportedFormatsChanged())); - QList<QVideoFrame::PixelFormat> formats = surface.supportedPixelFormats(); - QVERIFY(formats.count() == 1); - QVERIFY(spy.count() == 0); - - // user defined implementation for generation of supportedFormatsChanged signal - QList<QVideoFrame::PixelFormat> newFormats = surface.supportedPixelFormatsChange(formats); - QVERIFY(newFormats.count() == (formats.count() + 1)); - QVERIFY(spy.count() == 1); - spy.clear(); -} - -QTEST_MAIN(tst_QAbstractVideoSurface) - -#include "tst_qabstractvideosurface.moc" diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index b2384ac8b..8f2854cd4 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -31,7 +31,7 @@ #include <QtTest/QtTest> #include <QDebug> -#include <qabstractvideosurface.h> +#include <qvideosink.h> #include <private/qplatformcamera_p.h> #include <private/qplatformcameraexposure_p.h> #include <private/qplatformcamerafocus_p.h> @@ -44,7 +44,6 @@ #include <qobject.h> #include <qmediadevicemanager.h> -#include "mockvideosurface.h" #include "qmockintegration_p.h" #include "mockmediarecorderservice.h" @@ -642,10 +641,10 @@ void tst_QCamera::testCameraEncodingProperyChange() void tst_QCamera::testSetVideoOutput() { - MockVideoSurface surface; + QVideoSink surface; QCamera camera; -// camera.setViewfinder(static_cast<QAbstractVideoSurface *>(nullptr)); +// camera.setViewfinder(static_cast<QVideoSink *>(nullptr)); // QCOMPARE(mockCameraService->rendererRef, 0); @@ -653,7 +652,7 @@ void tst_QCamera::testSetVideoOutput() // QVERIFY(mockCameraService->rendererControl->surface() == &surface); // QCOMPARE(mockCameraService->rendererRef, 1); -// camera.setViewfinder(static_cast<QAbstractVideoSurface *>(nullptr)); +// camera.setViewfinder(static_cast<QVideoSink *>(nullptr)); // QVERIFY(mockCameraService->rendererControl->surface() == nullptr); // //rendererControl is released @@ -663,7 +662,7 @@ void tst_QCamera::testSetVideoOutput() // QVERIFY(mockCameraService->rendererControl->surface() == &surface); // QCOMPARE(mockCameraService->rendererRef, 1); -// camera.setViewfinder(static_cast<QAbstractVideoSurface *>(nullptr)); +// camera.setViewfinder(static_cast<QVideoSink *>(nullptr)); // QVERIFY(mockCameraService->rendererControl->surface() == nullptr); // //rendererControl is released // QCOMPARE(mockCameraService->rendererRef, 0); @@ -676,7 +675,7 @@ void tst_QCamera::testSetVideoOutput() void tst_QCamera::testSetVideoOutputNoService() { - MockVideoSurface surface; + QVideoSink surface; integration->setFlags(QMockIntegration::NoCaptureInterface); QCamera camera; @@ -687,7 +686,7 @@ void tst_QCamera::testSetVideoOutputNoService() void tst_QCamera::testSetVideoOutputDestruction() { - MockVideoSurface surface; + QVideoSink surface; { QCamera camera; diff --git a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp index 884d62f37..defe7e1d4 100644 --- a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp @@ -33,7 +33,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qbuffer.h> -#include <qabstractvideosurface.h> +#include <qvideosink.h> #include <qmediaplayer.h> #include <private/qplatformmediaplayer_p.h> #include <qmediaplaylist.h> @@ -41,7 +41,7 @@ #include "qmockintegration_p.h" #include "mockmediaplayer.h" -#include "mockvideosurface.h" +#include "qvideosink.h" QT_USE_NAMESPACE @@ -965,7 +965,7 @@ void tst_QMediaPlayer::testDestructor() void tst_QMediaPlayer::testSetVideoOutput() { - MockVideoSurface surface; + QVideoSink surface; player->setVideoOutput(static_cast<QObject *>(nullptr)); @@ -975,7 +975,7 @@ void tst_QMediaPlayer::testSetVideoOutput() // QVERIFY(mockService->rendererControl->surface() == &surface); // QCOMPARE(mockService->rendererRef, 1); - player->setVideoOutput(reinterpret_cast<QAbstractVideoSurface *>(0)); + player->setVideoOutput(reinterpret_cast<QVideoSink *>(0)); // QVERIFY(mockService->rendererControl->surface() == nullptr); //rendererControl is released @@ -997,7 +997,7 @@ void tst_QMediaPlayer::testSetVideoOutput() void tst_QMediaPlayer::testSetVideoOutputDestruction() { - MockVideoSurface surface; + QVideoSink surface; { QMediaPlayer player; player.setVideoOutput(&surface); diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp index a98e3619b..cd00a634d 100644 --- a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp +++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp @@ -43,8 +43,8 @@ #include <qgraphicsvideoitem.h> #include <qobject.h> #include <qvideowidget.h> +#include <qvideosink.h> -#include "mockvideosurface.h" #include "mockmediarecorderservice.h" #include "qmockintegration_p.h" @@ -113,7 +113,7 @@ void tst_QCameraWidgets::testSetVideoOutput() { QVideoWidget widget; QGraphicsVideoItem item; - MockVideoSurface surface; + QVideoSink surface; QMediaCaptureSession session; session.setVideoPreview(&widget); @@ -136,7 +136,7 @@ void tst_QCameraWidgets::testSetVideoOutput() session.setVideoPreview(&surface); // QVERIFY(mocksessionService->rendererControl->surface() == &surface); - session.setVideoPreview(reinterpret_cast<QAbstractVideoSurface *>(0)); + session.setVideoPreview(reinterpret_cast<QVideoSink *>(0)); // QVERIFY(mocksessionService->rendererControl->surface() == nullptr); session.setVideoPreview(&surface); diff --git a/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index 83ab7e21a..43c0e2870 100644 --- a/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -34,7 +34,7 @@ #include "qmediaservice.h" #include "qvideorenderercontrol.h" -#include <qabstractvideosurface.h> +#include <qvideosink.h> #include <qvideosurfaceformat.h> #include <QtWidgets/qapplication.h> @@ -72,11 +72,11 @@ private slots: class QtTestRendererControl : public QVideoRendererControl { public: - [[nodiscard]] QAbstractVideoSurface *surface() const override { return m_surface; } - void setSurface(QAbstractVideoSurface *surface) override { m_surface = surface; } + [[nodiscard]] QVideoSink *surface() const override { return m_surface; } + void setSurface(QVideoSink *surface) override { m_surface = surface; } private: - QAbstractVideoSurface *m_surface = nullptr; + QVideoSink *m_surface = nullptr; }; class QtTestVideoService : public QMediaService diff --git a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp index 6d0b5291b..a8fafc86b 100644 --- a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp +++ b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp @@ -33,11 +33,11 @@ #include <QtCore/qbuffer.h> #include <qgraphicsvideoitem.h> -#include <qabstractvideosurface.h> +#include <qvideosink.h> #include <qmediaplayer.h> #include <private/qplatformmediaplayer_p.h> -#include "mockvideosurface.h" +#include "qvideosink.h" #include "qmockintegration_p.h" QT_USE_NAMESPACE @@ -83,7 +83,7 @@ void tst_QMediaPlayerWidgets::testSetVideoOutput() { QVideoWidget widget; QGraphicsVideoItem item; - MockVideoSurface surface; + QVideoSink surface; QMediaPlayer player; @@ -106,7 +106,7 @@ void tst_QMediaPlayerWidgets::testSetVideoOutput() player.setVideoOutput(&surface); // QVERIFY(mockService->rendererControl->surface() == &surface); - player.setVideoOutput(reinterpret_cast<QAbstractVideoSurface *>(0)); + player.setVideoOutput(reinterpret_cast<QVideoSink *>(0)); // QVERIFY(mockService->rendererControl->surface() == nullptr); player.setVideoOutput(&surface); @@ -126,7 +126,7 @@ void tst_QMediaPlayerWidgets::testSetVideoOutputNoService() { QVideoWidget widget; QGraphicsVideoItem item; - MockVideoSurface surface; + QVideoSink surface; mockIntegration->setFlags(QMockIntegration::NoPlayerInterface); QMediaPlayer player; @@ -144,7 +144,7 @@ void tst_QMediaPlayerWidgets::testSetVideoOutputNoControl() { QVideoWidget widget; QGraphicsVideoItem item; - MockVideoSurface surface; + QVideoSink surface; QMediaPlayer player; diff --git a/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index 20e597077..f4fa1bfb6 100644 --- a/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -32,6 +32,7 @@ #include "qdeclarativeaudio_p.h" #include "qdeclarativemediametadata_p.h" +#include <qvideosink.h> #include "mockmediaplayer.h" #include "qmockintegration_p.h" @@ -39,7 +40,6 @@ #include <QtMultimedia/qmediametadata.h> #include <private/qplatformmediaplayer_p.h> #include <private/qdeclarativevideooutput_p.h> -#include <QAbstractVideoSurface> #include <QtGui/qguiapplication.h> #include <QtQml/qqmlengine.h> @@ -913,17 +913,6 @@ int tst_QDeclarativeAudio::keyToValue(const QMetaEnum &enumeration, const char * return result; } -struct Surface : QAbstractVideoSurface -{ - Surface(QObject *parent = nullptr) : QAbstractVideoSurface(parent) { } - [[nodiscard]] QList<QVideoFrame::PixelFormat> supportedPixelFormats(QVideoFrame::HandleType) const override - { - return QList<QVideoFrame::PixelFormat>() << QVideoFrame::Format_RGB32; - } - - bool present(const QVideoFrame &) override { return true; } -}; - void tst_QDeclarativeAudio::videoOutput() { QDeclarativeAudio audio; @@ -935,15 +924,15 @@ void tst_QDeclarativeAudio::videoOutput() QVERIFY(audio.videoOutput().isNull()); QVariant surface; - surface.setValue(new Surface(this)); + surface.setValue(new QVideoSink(this)); audio.setVideoOutput(surface); QCOMPARE(audio.videoOutput(), surface); QCOMPARE(spy.count(), 1); QQmlEngine engine; QJSValue jsArray = engine.newArray(5); - jsArray.setProperty(0, engine.newQObject(new Surface(this))); - jsArray.setProperty(1, engine.newQObject(new Surface(this))); + jsArray.setProperty(0, engine.newQObject(new QVideoSink(this))); + jsArray.setProperty(1, engine.newQObject(new QVideoSink(this))); QDeclarativeVideoOutput output; jsArray.setProperty(2, engine.newQObject(&output)); jsArray.setProperty(3, 123); diff --git a/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp index e616d5ce7..0c586eb21 100644 --- a/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp +++ b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp @@ -33,7 +33,7 @@ #include "qdeclarativevideo_p.h" -#include <qabstractvideosurface.h> +#include <qvideosink.h> #include <qgraphicsvideoitem.h> #include <private/qplatformmediaplayer_p.h> #include <qmediaservice.h> @@ -174,11 +174,11 @@ class QtTestRendererControl : public QVideoRendererControl public: QtTestRendererControl(QObject *parent ) : QVideoRendererControl(parent), m_surface(0) {} - QAbstractVideoSurface *surface() const { return m_surface; } - void setSurface(QAbstractVideoSurface *surface) { m_surface = surface; } + QVideoSink *surface() const { return m_surface; } + void setSurface(QVideoSink *surface) { m_surface = surface; } private: - QAbstractVideoSurface *m_surface; + QVideoSink *m_surface; }; class QtTestWindowControl : public QPlatformVideoSink @@ -952,9 +952,9 @@ void tst_QDeclarativeVideo::geometry() videoItem->paint(&painter, 0); } - QAbstractVideoSurface *surface = provider.rendererControl()->surface(); + QVideoSink *surface = provider.rendererControl()->surface(); - //video item can use overlay, QAbstractVideoSurface is not used than. + //video item can use overlay, QVideoSink is not used than. if (surface) { QVideoSurfaceFormat format(QSize(640, 480), QVideoFrame::Format_RGB32); |