Rename FFmpegSurfaceCaptureThread to FFmpegSurfaceCaptureGrabber

Due to FFmpeg surface capture refactoring, the name of the class should
be changed as the class no longer inherits QThread.

Pick-to: 6.6 6.5
Change-Id: I2df79bb507b4ef1d730d01e3b76c297c8fadb8af
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 0bd0da8eab9c138c1017e85763b2866e8da76b76)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

10 files changed, 46 insertions, 46 deletions

diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
index d23afd4e4..1be16e268 100644
--- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt
+++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
@@ -35,7 +35,7 @@ qt_internal_add_plugin(QFFmpegMediaPlugin
         qffmpegvideoframeencoder.cpp qffmpegvideoframeencoder_p.h
         qffmpegvideoencoderutils.cpp qffmpegvideoencoderutils_p.h
         qgrabwindowsurfacecapture.cpp qgrabwindowsurfacecapture_p.h
-        qffmpegsurfacecapturethread.cpp qffmpegsurfacecapturethread_p.h
+        qffmpegsurfacecapturegrabber.cpp qffmpegsurfacecapturegrabber_p.h
         qffmpegsymbolsresolve_p.h
 
         qffmpegplaybackengine.cpp qffmpegplaybackengine_p.h
diff --git a/src/plugins/multimedia/ffmpeg/qavfscreencapture.mm b/src/plugins/multimedia/ffmpeg/qavfscreencapture.mm
index 903431e66..715dea09c 100644
--- a/src/plugins/multimedia/ffmpeg/qavfscreencapture.mm
+++ b/src/plugins/multimedia/ffmpeg/qavfscreencapture.mm
@@ -3,7 +3,7 @@
 
 #include "qavfscreencapture_p.h"
 #include "qavfsamplebufferdelegate_p.h"
-#include "qffmpegsurfacecapturethread_p.h"
+#include "qffmpegsurfacecapturegrabber_p.h"
 
 #include <qscreen.h>
 
diff --git a/src/plugins/multimedia/ffmpeg/qcgwindowcapture.mm b/src/plugins/multimedia/ffmpeg/qcgwindowcapture.mm
index dc2362b26..93b079bac 100644
--- a/src/plugins/multimedia/ffmpeg/qcgwindowcapture.mm
+++ b/src/plugins/multimedia/ffmpeg/qcgwindowcapture.mm
@@ -3,7 +3,7 @@
 
 #include "qcgwindowcapture_p.h"
 #include "private/qcapturablewindow_p.h"
-#include "qffmpegsurfacecapturethread_p.h"
+#include "qffmpegsurfacecapturegrabber_p.h"
 #include "private/qabstractvideobuffer_p.h"
 
 #include "qscreen.h"
@@ -73,7 +73,7 @@ private:
     size_t m_bytesPerLine = 0;
 };
 
-class QCGWindowCapture::Grabber : public QFFmpegSurfaceCaptureThread
+class QCGWindowCapture::Grabber : public QFFmpegSurfaceCaptureGrabber
 {
 public:
     Grabber(QCGWindowCapture &capture, CGWindowID wid) : m_capture(capture), m_wid(wid)
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
index e29c2ab03..d38e42e47 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
@@ -3,7 +3,7 @@
 // GPL-3.0-only
 
 #include "qffmpegscreencapture_dxgi_p.h"
-#include "qffmpegsurfacecapturethread_p.h"
+#include "qffmpegsurfacecapturegrabber_p.h"
 #include <private/qabstractvideobuffer_p.h>
 #include <private/qmultimediautils_p.h>
 #include <private/qwindowsmultimediautils_p.h>
@@ -352,7 +352,7 @@ QVideoFrameFormat getFrameFormat(QScreen* screen)
 
 } // namespace
 
-class QFFmpegScreenCaptureDxgi::Grabber : public QFFmpegSurfaceCaptureThread
+class QFFmpegScreenCaptureDxgi::Grabber : public QFFmpegSurfaceCaptureGrabber
 {
 public:
     Grabber(QFFmpegScreenCaptureDxgi &screenCapture, QScreen *screen,
@@ -425,7 +425,7 @@ public:
             return;
         }
 
-        QFFmpegSurfaceCaptureThread::initializeGrabbingContext();
+        QFFmpegSurfaceCaptureGrabber::initializeGrabbingContext();
     }
 
 private:
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegsurfacecapturethread.cpp b/src/plugins/multimedia/ffmpeg/qffmpegsurfacecapturegrabber.cpp
index b53d393ee..0a45d7341 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegsurfacecapturethread.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegsurfacecapturegrabber.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#include "qffmpegsurfacecapturethread_p.h"
+#include "qffmpegsurfacecapturegrabber_p.h"
 
 #include <qelapsedtimer.h>
 #include <qloggingcategory.h>
@@ -10,7 +10,7 @@
 
 QT_BEGIN_NAMESPACE
 
-static Q_LOGGING_CATEGORY(qLcScreenCaptureThread, "qt.multimedia.ffmpeg.surfacecapturethread");
+static Q_LOGGING_CATEGORY(qLcScreenCaptureGrabber, "qt.multimedia.ffmpeg.surfacecapturegrabber");
 
 namespace {
 
@@ -50,7 +50,7 @@ private:
 
 } // namespace
 
-struct QFFmpegSurfaceCaptureThread::GrabbingContext
+struct QFFmpegSurfaceCaptureGrabber::GrabbingContext
 {
     GrabbingProfiler profiler;
     QTimer timer;
@@ -58,10 +58,10 @@ struct QFFmpegSurfaceCaptureThread::GrabbingContext
     qint64 lastFrameTime = 0;
 };
 
-class QFFmpegSurfaceCaptureThread::GrabbingThread : public QThread
+class QFFmpegSurfaceCaptureGrabber::GrabbingThread : public QThread
 {
 public:
-    GrabbingThread(QFFmpegSurfaceCaptureThread& grabber)
+    GrabbingThread(QFFmpegSurfaceCaptureGrabber& grabber)
         : m_grabber(grabber)
     {}
 
@@ -78,10 +78,10 @@ protected:
     }
 
 private:
-    QFFmpegSurfaceCaptureThread& m_grabber;
+    QFFmpegSurfaceCaptureGrabber& m_grabber;
 };
 
-QFFmpegSurfaceCaptureThread::QFFmpegSurfaceCaptureThread(bool runInThread)
+QFFmpegSurfaceCaptureGrabber::QFFmpegSurfaceCaptureGrabber(bool runInThread)
 {
     setFrameRate(DefaultScreenCaptureFrameRate);
 
@@ -91,7 +91,7 @@ QFFmpegSurfaceCaptureThread::QFFmpegSurfaceCaptureThread(bool runInThread)
     m_thread = std::make_unique<GrabbingThread>(*this);
 }
 
-void QFFmpegSurfaceCaptureThread::start()
+void QFFmpegSurfaceCaptureGrabber::start()
 {
     if (m_thread)
         m_thread->start();
@@ -99,24 +99,24 @@ void QFFmpegSurfaceCaptureThread::start()
         initializeGrabbingContext();
 }
 
-QFFmpegSurfaceCaptureThread::~QFFmpegSurfaceCaptureThread() = default;
+QFFmpegSurfaceCaptureGrabber::~QFFmpegSurfaceCaptureGrabber() = default;
 
-void QFFmpegSurfaceCaptureThread::setFrameRate(qreal rate)
+void QFFmpegSurfaceCaptureGrabber::setFrameRate(qreal rate)
 {
     rate = qBound(MinScreenCaptureFrameRate, rate, MaxScreenCaptureFrameRate);
     if (std::exchange(m_rate, rate) != rate) {
-        qCDebug(qLcScreenCaptureThread) << "Screen capture rate has been changed:" << m_rate;
+        qCDebug(qLcScreenCaptureGrabber) << "Screen capture rate has been changed:" << m_rate;
 
         updateTimerInterval();
     }
 }
 
-qreal QFFmpegSurfaceCaptureThread::frameRate() const
+qreal QFFmpegSurfaceCaptureGrabber::frameRate() const
 {
     return m_rate;
 }
 
-void QFFmpegSurfaceCaptureThread::stop()
+void QFFmpegSurfaceCaptureGrabber::stop()
 {
     if (m_thread)
     {
@@ -129,7 +129,7 @@ void QFFmpegSurfaceCaptureThread::stop()
     }
 }
 
-void QFFmpegSurfaceCaptureThread::updateError(QPlatformSurfaceCapture::Error error,
+void QFFmpegSurfaceCaptureGrabber::updateError(QPlatformSurfaceCapture::Error error,
                                              const QString &description)
 {
     const auto prevError = std::exchange(m_prevError, error);
@@ -142,7 +142,7 @@ void QFFmpegSurfaceCaptureThread::updateError(QPlatformSurfaceCapture::Error err
     updateTimerInterval();
 }
 
-void QFFmpegSurfaceCaptureThread::updateTimerInterval()
+void QFFmpegSurfaceCaptureGrabber::updateTimerInterval()
 {
     const qreal rate = m_prevError && *m_prevError != QPlatformSurfaceCapture::NoError
             ? MinScreenCaptureFrameRate
@@ -152,10 +152,10 @@ void QFFmpegSurfaceCaptureThread::updateTimerInterval()
         m_context->timer.setInterval(interval);
 }
 
-void QFFmpegSurfaceCaptureThread::initializeGrabbingContext()
+void QFFmpegSurfaceCaptureGrabber::initializeGrabbingContext()
 {
     Q_ASSERT(!isGrabbingContextInitialized());
-    qCDebug(qLcScreenCaptureThread) << "screen capture started";
+    qCDebug(qLcScreenCaptureGrabber) << "screen capture started";
 
     m_context = std::make_unique<GrabbingContext>();
     m_context->timer.setTimerType(Qt::PreciseTimer);
@@ -185,20 +185,20 @@ void QFFmpegSurfaceCaptureThread::initializeGrabbingContext()
     m_context->timer.start();
 }
 
-void QFFmpegSurfaceCaptureThread::finalizeGrabbingContext()
+void QFFmpegSurfaceCaptureGrabber::finalizeGrabbingContext()
 {
     Q_ASSERT(isGrabbingContextInitialized());
-    qCDebug(qLcScreenCaptureThread)
+    qCDebug(qLcScreenCaptureGrabber)
             << "end screen capture thread; avg grabbing time:" << m_context->profiler.avgTime()
             << "ms, grabbings number:" << m_context->profiler.number();
     m_context.reset();
 }
 
-bool QFFmpegSurfaceCaptureThread::isGrabbingContextInitialized() const
+bool QFFmpegSurfaceCaptureGrabber::isGrabbingContextInitialized() const
 {
     return m_context != nullptr;
 }
 
 QT_END_NAMESPACE
 
-#include "moc_qffmpegsurfacecapturethread_p.cpp"
+#include "moc_qffmpegsurfacecapturegrabber_p.cpp"
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegsurfacecapturethread_p.h b/src/plugins/multimedia/ffmpeg/qffmpegsurfacecapturegrabber_p.h
index 9c8fb91f5..91181d1b4 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegsurfacecapturethread_p.h
+++ b/src/plugins/multimedia/ffmpeg/qffmpegsurfacecapturegrabber_p.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QFFMPEGSURFACECAPTURETHREAD_P_H
-#define QFFMPEGSURFACECAPTURETHREAD_P_H
+#ifndef QFFMPEGSURFACECAPTUREGRABBER_P_H
+#define QFFMPEGSURFACECAPTUREGRABBER_P_H
 
 //
 //  W A R N I N G
@@ -34,13 +34,13 @@ static constexpr qreal DefaultScreenCaptureFrameRate = 60.;
 static constexpr qreal MaxScreenCaptureFrameRate = 60.;
 static constexpr qreal MinScreenCaptureFrameRate = 1.;
 
-class QFFmpegSurfaceCaptureThread : public QObject
+class QFFmpegSurfaceCaptureGrabber : public QObject
 {
     Q_OBJECT
 public:
-    QFFmpegSurfaceCaptureThread(bool runInThread = true);
+    QFFmpegSurfaceCaptureGrabber(bool runInThread = true);
 
-    ~QFFmpegSurfaceCaptureThread() override;
+    ~QFFmpegSurfaceCaptureGrabber() override;
 
     void start();
     void stop();
@@ -48,7 +48,7 @@ public:
     template<typename Object, typename Method>
     void addFrameCallback(Object &object, Method method)
     {
-        connect(this, &QFFmpegSurfaceCaptureThread::frameGrabbed,
+        connect(this, &QFFmpegSurfaceCaptureGrabber::frameGrabbed,
                 &object, method, Qt::DirectConnection);
     }
 
@@ -84,4 +84,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QFFMPEGSURFACECAPTURETHREAD_P_H
+#endif // QFFMPEGSURFACECAPTUREGRABBER_P_H
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegwindowcapture_uwp.cpp b/src/plugins/multimedia/ffmpeg/qffmpegwindowcapture_uwp.cpp
index a5f1c76b2..1588c6bed 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegwindowcapture_uwp.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegwindowcapture_uwp.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qffmpegwindowcapture_uwp_p.h"
-#include "qffmpegsurfacecapturethread_p.h"
+#include "qffmpegsurfacecapturegrabber_p.h"
 #include <private/qabstractvideobuffer_p.h>
 
 #include <unknwn.h>
@@ -292,7 +292,7 @@ private:
 
 } // namespace
 
-class QFFmpegWindowCaptureUwp::Grabber : public QFFmpegSurfaceCaptureThread
+class QFFmpegWindowCaptureUwp::Grabber : public QFFmpegSurfaceCaptureGrabber
 {
     Q_OBJECT
 public:
@@ -327,7 +327,7 @@ protected:
         try {
             m_windowGrabber = std::make_unique<WindowGrabber>(m_adapter.get(), m_hwnd);
 
-            QFFmpegSurfaceCaptureThread::initializeGrabbingContext();
+            QFFmpegSurfaceCaptureGrabber::initializeGrabbingContext();
         } catch (const winrt::hresult_error &err) {
 
             const QString message = QLatin1String("Unable to capture window: ")
@@ -339,7 +339,7 @@ protected:
 
     void finalizeGrabbingContext() override
     {
-        QFFmpegSurfaceCaptureThread::finalizeGrabbingContext();
+        QFFmpegSurfaceCaptureGrabber::finalizeGrabbingContext();
         m_windowGrabber = nullptr;
     }
 
diff --git a/src/plugins/multimedia/ffmpeg/qgdiwindowcapture.cpp b/src/plugins/multimedia/ffmpeg/qgdiwindowcapture.cpp
index 9609e5d21..4188ed4c2 100644
--- a/src/plugins/multimedia/ffmpeg/qgdiwindowcapture.cpp
+++ b/src/plugins/multimedia/ffmpeg/qgdiwindowcapture.cpp
@@ -4,7 +4,7 @@
 #include "qgdiwindowcapture_p.h"
 
 #include "qvideoframe.h"
-#include "qffmpegsurfacecapturethread_p.h"
+#include "qffmpegsurfacecapturegrabber_p.h"
 #include "private/qcapturablewindow_p.h"
 #include "private/qmemoryvideobuffer_p.h"
 
@@ -15,7 +15,7 @@ static Q_LOGGING_CATEGORY(qLcGdiWindowCapture, "qt.multimedia.ffmpeg.gdiwindowca
 
 QT_BEGIN_NAMESPACE
 
-class QGdiWindowCapture::Grabber : public QFFmpegSurfaceCaptureThread
+class QGdiWindowCapture::Grabber : public QFFmpegSurfaceCaptureGrabber
 {
 public:
     static std::unique_ptr<Grabber> create(QGdiWindowCapture &capture, HWND hWnd)
diff --git a/src/plugins/multimedia/ffmpeg/qgrabwindowsurfacecapture.cpp b/src/plugins/multimedia/ffmpeg/qgrabwindowsurfacecapture.cpp
index 034dc5813..f9951a742 100644
--- a/src/plugins/multimedia/ffmpeg/qgrabwindowsurfacecapture.cpp
+++ b/src/plugins/multimedia/ffmpeg/qgrabwindowsurfacecapture.cpp
@@ -4,7 +4,7 @@
 #include "qvideoframe.h"
 #include "qgrabwindowsurfacecapture_p.h"
 #include "qscreencapture.h"
-#include "qffmpegsurfacecapturethread_p.h"
+#include "qffmpegsurfacecapturegrabber_p.h"
 
 #include "private/qabstractvideobuffer_p.h"
 
@@ -61,7 +61,7 @@ public:
 
 } // namespace
 
-class QGrabWindowSurfaceCapture::Grabber : public QFFmpegSurfaceCaptureThread
+class QGrabWindowSurfaceCapture::Grabber : public QFFmpegSurfaceCaptureGrabber
 {
 public:
     Grabber(QGrabWindowSurfaceCapture &capture, QScreen *screen) : Grabber(capture, screen, nullptr)
@@ -91,7 +91,7 @@ public:
 
 private:
     Grabber(QGrabWindowSurfaceCapture &capture, QScreen *screen, WindowUPtr window)
-        : QFFmpegSurfaceCaptureThread(QGuiApplication::platformName() != QLatin1String("eglfs")), m_capture(capture), m_screen(screen), m_window(std::move(window))
+        : QFFmpegSurfaceCaptureGrabber(QGuiApplication::platformName() != QLatin1String("eglfs")), m_capture(capture), m_screen(screen), m_window(std::move(window))
     {
         connect(qApp, &QGuiApplication::screenRemoved, this, &Grabber::onScreenRemoved);
         addFrameCallback(m_capture, &QGrabWindowSurfaceCapture::newVideoFrame);
diff --git a/src/plugins/multimedia/ffmpeg/qx11surfacecapture.cpp b/src/plugins/multimedia/ffmpeg/qx11surfacecapture.cpp
index 81adfea33..1f04703f1 100644
--- a/src/plugins/multimedia/ffmpeg/qx11surfacecapture.cpp
+++ b/src/plugins/multimedia/ffmpeg/qx11surfacecapture.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qx11surfacecapture_p.h"
-#include "qffmpegsurfacecapturethread_p.h"
+#include "qffmpegsurfacecapturegrabber_p.h"
 
 #include <qvideoframe.h>
 #include <qscreen.h>
@@ -83,7 +83,7 @@ QVideoFrameFormat::PixelFormat xImagePixelFormat(const XImage &image)
 
 } // namespace
 
-class QX11SurfaceCapture::Grabber : private QFFmpegSurfaceCaptureThread
+class QX11SurfaceCapture::Grabber : private QFFmpegSurfaceCaptureGrabber
 {
 public:
     static std::unique_ptr<Grabber> create(QX11SurfaceCapture &capture, QScreen *screen)