diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-05-12 12:33:44 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-05-12 12:02:45 +0000 |
| commit | 15aa7f7ea87c98642257bbea8833636621956e2e (patch) | |
| tree | b66388b5b90d068e5258515a5017939272c866c5 /src/multimedia | |
| parent | ec2760e61d7e9a22578d7957f7e3317e3295ab2c (diff) | |
Fix Windows build
GUID is not declared anywhere, so include the platform header in the
private header. Change UINT32 (also not declared) to quint32 in the header,
and include missing QMimeType.
Change-Id: I69d562400c635c86b31941114c7e92b5a96b812c
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Diffstat (limited to 'src/multimedia')
4 files changed, 6 insertions, 3 deletions
diff --git a/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h b/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h index 7f885602b..fa6b27a85 100644 --- a/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h +++ b/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h @@ -54,6 +54,7 @@ #include <private/qtmultimediaglobal_p.h> #include <private/qplatformmediaformatinfo_p.h> #include <qvideoframeformat.h> +#include <guiddef.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp index 04944a57c..2557a74f1 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp @@ -216,7 +216,7 @@ bool QWindowsCameraSession::resumeRecording() } // empirical estimate of the required video bitrate (for H.264) -UINT32 QWindowsCameraSession::estimateVideoBitRate(const GUID &videoFormat, UINT32 width, UINT32 height, +quint32 QWindowsCameraSession::estimateVideoBitRate(const GUID &videoFormat, quint32 width, quint32 height, qreal frameRate, QMediaEncoderSettings::Quality quality) { Q_UNUSED(videoFormat); @@ -244,7 +244,7 @@ UINT32 QWindowsCameraSession::estimateVideoBitRate(const GUID &videoFormat, UINT // Required bitrate is not linear on the number of pixels; small resolutions // require more BPP, thus the minimum values, to try to compensate it. - UINT32 pixelsPerSec = UINT32(qMax(width, 320u) * qMax(height, 240u) * qMax(frameRate, 6.0)); + quint32 pixelsPerSec = quint32(qMax(width, 320u) * qMax(height, 240u) * qMax(frameRate, 6.0)); return pixelsPerSec * bitsPerPixel; } diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h index 6c54b710d..46f3d9ac5 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h +++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h @@ -54,6 +54,7 @@ #include <private/qtmultimediaglobal_p.h> #include <qcamera.h> #include <qmediaencodersettings.h> +#include <qwindowsmultimediautils_p.h> QT_BEGIN_NAMESPACE @@ -109,7 +110,7 @@ private Q_SLOTS: void handleStreamingStopped(); private: - UINT32 estimateVideoBitRate(const GUID &videoFormat, UINT32 width, UINT32 height, + quint32 estimateVideoBitRate(const GUID &videoFormat, quint32 width, quint32 height, qreal frameRate, QMediaEncoderSettings::Quality quality); bool m_active = false; bool m_readyForCapture = false; diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp index bfe17748b..4418d76ff 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp @@ -42,6 +42,7 @@ #include "qwindowscamerasession_p.h" #include "qwindowsmediacapture_p.h" #include <QtCore/QUrl> +#include <QtCore/QMimeType> QT_BEGIN_NAMESPACE |