Clean up most QAbstractVideoSurface usages

The class is scheduled to be removed, once all it's
usages are gone. QVideoSink is the replacement going
forward.

Change-Id: Idc0a4133496839bf9f95aa9bcf7d6d37cacd549b
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 0 insertions, 36 deletions

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