Fix ffmpeg encoding issues

Fixed a bunch of problems:
- wrong frame intervals in macos camera and screen capturing
- missing frame rate in screen capturing format
- wrong scaling in encoder

Also, some recording tests have been added

Task-number: QTBUG-103226
Pick-to: 6.5
Change-Id: Id775f31e01d75d5c9f3c4ec20c33074acab1ab20
Reviewed-by: Lars Knoll <lars@knoll.priv.no>

2 files changed, 9 insertions, 0 deletions

diff --git a/src/multimedia/platform/qplatformscreencapture.cpp b/src/multimedia/platform/qplatformscreencapture.cpp
index 57ff87029..7a9f568d9 100644
--- a/src/multimedia/platform/qplatformscreencapture.cpp
+++ b/src/multimedia/platform/qplatformscreencapture.cpp
@@ -53,6 +53,11 @@ QScreenCapture *QPlatformScreenCapture::screenCapture() const
     return m_screenCapture;
 }
 
+std::optional<int> QPlatformScreenCapture::ffmpegHWPixelFormat() const
+{
+    return {};
+}
+
 void QPlatformScreenCapture::updateError(QScreenCapture::Error error, const QString &errorString)
 {
     bool changed = error != m_error || errorString != m_errorString;
diff --git a/src/multimedia/platform/qplatformscreencapture_p.h b/src/multimedia/platform/qplatformscreencapture_p.h
index c98437268..8da927d8d 100644
--- a/src/multimedia/platform/qplatformscreencapture_p.h
+++ b/src/multimedia/platform/qplatformscreencapture_p.h
@@ -24,6 +24,8 @@
 #include "qscreencapture.h"
 #include "qvideoframeformat.h"
 
+#include <optional>
+
 QT_BEGIN_NAMESPACE
 
 class QVideoFrame;
@@ -54,6 +56,8 @@ public:
 
     QScreenCapture *screenCapture() const;
 
+    virtual std::optional<int> ffmpegHWPixelFormat() const;
+
 public Q_SLOTS:
     void updateError(QScreenCapture::Error error, const QString &errorString);