diff options
8 files changed, 0 insertions, 36 deletions
diff --git a/src/multimedia/platform/darwin/avfvideosink.mm b/src/multimedia/platform/darwin/avfvideosink.mm index 3bd88ca95..b0d727038 100644 --- a/src/multimedia/platform/darwin/avfvideosink.mm +++ b/src/multimedia/platform/darwin/avfvideosink.mm @@ -121,10 +121,6 @@ void AVFVideoSink::setFullScreen(bool fullScreen) m_interface->reconfigure(); } -void AVFVideoSink::repaint() -{ -} - QSize AVFVideoSink::nativeSize() const { return m_nativeSize; diff --git a/src/multimedia/platform/darwin/avfvideosink_p.h b/src/multimedia/platform/darwin/avfvideosink_p.h index 51bb02107..a5b5ade35 100644 --- a/src/multimedia/platform/darwin/avfvideosink_p.h +++ b/src/multimedia/platform/darwin/avfvideosink_p.h @@ -92,7 +92,6 @@ public: bool isFullScreen() const override; void setFullScreen(bool fullScreen) override; - void repaint() override; QSize nativeSize() const override; void setNativeSize(QSize size); diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay.cpp index 33b1d91f8..5db0497e9 100644 --- a/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay.cpp @@ -440,15 +440,6 @@ void QGstreamerVideoOverlay::setWindowHandle_helper(WId id) } } -void QGstreamerVideoOverlay::expose() -{ - if (!isActive()) - return; - - if (!m_videoSink.isNull() && GST_IS_VIDEO_OVERLAY(m_videoSink.object())) - gst_video_overlay_expose(GST_VIDEO_OVERLAY(m_videoSink.object())); -} - void QGstreamerVideoOverlay::setRenderRectangle(const QRect &rect) { int x = -1; diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h index 407756942..48571d926 100644 --- a/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h +++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h @@ -75,7 +75,6 @@ public: QSize nativeVideoSize() const; void setWindowHandle(WId id); - void expose(); void setRenderRectangle(const QRect &rect); bool isActive() const; diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideosink.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideosink.cpp index 75a548225..d3d1647da 100644 --- a/src/multimedia/platform/gstreamer/common/qgstreamervideosink.cpp +++ b/src/multimedia/platform/gstreamer/common/qgstreamervideosink.cpp @@ -128,7 +128,6 @@ QRect QGstreamerVideoSink::displayRect() const void QGstreamerVideoSink::setDisplayRect(const QRect &rect) { m_videoOverlay->setRenderRectangle(m_displayRect = rect); - repaint(); } Qt::AspectRatioMode QGstreamerVideoSink::aspectRatioMode() const @@ -141,11 +140,6 @@ void QGstreamerVideoSink::setAspectRatioMode(Qt::AspectRatioMode mode) m_videoOverlay->setAspectRatioMode(mode); } -void QGstreamerVideoSink::repaint() -{ - m_videoOverlay->expose(); -} - int QGstreamerVideoSink::brightness() const { return m_videoOverlay->brightness(); diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideosink_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideosink_p.h index 3142d8de6..d75dc25b0 100644 --- a/src/multimedia/platform/gstreamer/common/qgstreamervideosink_p.h +++ b/src/multimedia/platform/gstreamer/common/qgstreamervideosink_p.h @@ -92,8 +92,6 @@ public: Qt::AspectRatioMode aspectRatioMode() const override; void setAspectRatioMode(Qt::AspectRatioMode mode) override; - void repaint() override; - int brightness() const override; void setBrightness(int brightness) override; diff --git a/src/multimedia/platform/qplatformvideosink_p.h b/src/multimedia/platform/qplatformvideosink_p.h index d519f17f0..61f0a678d 100644 --- a/src/multimedia/platform/qplatformvideosink_p.h +++ b/src/multimedia/platform/qplatformvideosink_p.h @@ -72,8 +72,6 @@ public: virtual bool isFullScreen() const = 0; virtual void setFullScreen(bool fullScreen) = 0; - virtual void repaint() = 0; - virtual QSize nativeSize() const = 0; virtual Qt::AspectRatioMode aspectRatioMode() const = 0; diff --git a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp index 1fcdbbd13..657e43a8f 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp +++ b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp @@ -69,10 +69,6 @@ public: [[nodiscard]] bool isFullScreen() const override { return m_fullScreen; } void setFullScreen(bool fullScreen) override { m_fullScreen = fullScreen; } - [[nodiscard]] int repaintCount() const { return m_repaintCount; } - void setRepaintCount(int count) { m_repaintCount = count; } - void repaint() override { ++m_repaintCount; } - [[nodiscard]] QSize nativeSize() const override { return m_nativeSize; } void setNativeSize(const QSize &size) { m_nativeSize = size; emit nativeSizeChanged(); } @@ -93,7 +89,6 @@ public: private: WId m_winId = 0; - int m_repaintCount = 0; int m_brightness = 0; int m_contrast = 0; int m_hue = 0; @@ -186,23 +181,17 @@ void tst_QDeclarativeVideoOutputWindow::nativeSize() void tst_QDeclarativeVideoOutputWindow::aspectRatio() { const QRect expectedDisplayRect(25, 50, 150, 100); - int oldRepaintCount = m_windowControl.repaintCount(); m_videoItem->setProperty("fillMode", QDeclarativeVideoOutput::Stretch); QTRY_COMPARE(m_windowControl.aspectRatioMode(), Qt::IgnoreAspectRatio); QCOMPARE(m_windowControl.displayRect(), expectedDisplayRect); - QVERIFY(m_windowControl.repaintCount() > oldRepaintCount); - oldRepaintCount = m_windowControl.repaintCount(); m_videoItem->setProperty("fillMode", QDeclarativeVideoOutput::PreserveAspectFit); QTRY_COMPARE(m_windowControl.aspectRatioMode(), Qt::KeepAspectRatio); QCOMPARE(m_windowControl.displayRect(), expectedDisplayRect); - QVERIFY(m_windowControl.repaintCount() > oldRepaintCount); - oldRepaintCount = m_windowControl.repaintCount(); m_videoItem->setProperty("fillMode", QDeclarativeVideoOutput::PreserveAspectCrop); QTRY_COMPARE(m_windowControl.aspectRatioMode(), Qt::KeepAspectRatioByExpanding); QCOMPARE(m_windowControl.displayRect(), expectedDisplayRect); - QVERIFY(m_windowControl.repaintCount() > oldRepaintCount); } void tst_QDeclarativeVideoOutputWindow::geometryChange() |