diff options
Diffstat (limited to 'src/multimedia/platform/windows/mediacapture')
| -rw-r--r-- | src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession.cpp | 34 | ||||
| -rw-r--r-- | src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession_p.h | 6 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession.cpp index 1776f9fe9..f46f15127 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession.cpp @@ -238,25 +238,25 @@ bool QWindowsMediaDeviceSession::resumeRecording() // empirical estimate of the required video bitrate (for H.264) quint32 QWindowsMediaDeviceSession::estimateVideoBitRate(const GUID &videoFormat, quint32 width, quint32 height, - qreal frameRate, QMediaEncoderSettings::Quality quality) + qreal frameRate, QMediaRecorder::Quality quality) { Q_UNUSED(videoFormat); qreal bitsPerPixel; switch (quality) { - case QMediaEncoderSettings::Quality::VeryLowQuality: + case QMediaRecorder::Quality::VeryLowQuality: bitsPerPixel = 0.08; break; - case QMediaEncoderSettings::Quality::LowQuality: + case QMediaRecorder::Quality::LowQuality: bitsPerPixel = 0.2; break; - case QMediaEncoderSettings::Quality::NormalQuality: + case QMediaRecorder::Quality::NormalQuality: bitsPerPixel = 0.3; break; - case QMediaEncoderSettings::Quality::HighQuality: + case QMediaRecorder::Quality::HighQuality: bitsPerPixel = 0.5; break; - case QMediaEncoderSettings::Quality::VeryHighQuality: + case QMediaRecorder::Quality::VeryHighQuality: bitsPerPixel = 0.8; break; default: @@ -269,20 +269,20 @@ quint32 QWindowsMediaDeviceSession::estimateVideoBitRate(const GUID &videoFormat return pixelsPerSec * bitsPerPixel; } -quint32 QWindowsMediaDeviceSession::estimateAudioBitRate(const GUID &audioFormat, QMediaEncoderSettings::Quality quality) +quint32 QWindowsMediaDeviceSession::estimateAudioBitRate(const GUID &audioFormat, QMediaRecorder::Quality quality) { if (audioFormat == MFAudioFormat_AAC) { // Bitrates supported by the AAC encoder are 96K, 128K, 160K, 192K. switch (quality) { - case QMediaEncoderSettings::Quality::VeryLowQuality: + case QMediaRecorder::Quality::VeryLowQuality: return 96000; - case QMediaEncoderSettings::Quality::LowQuality: + case QMediaRecorder::Quality::LowQuality: return 96000; - case QMediaEncoderSettings::Quality::NormalQuality: + case QMediaRecorder::Quality::NormalQuality: return 128000; - case QMediaEncoderSettings::Quality::HighQuality: + case QMediaRecorder::Quality::HighQuality: return 160000; - case QMediaEncoderSettings::Quality::VeryHighQuality: + case QMediaRecorder::Quality::VeryHighQuality: return 192000; } return 128000; @@ -290,15 +290,15 @@ quint32 QWindowsMediaDeviceSession::estimateAudioBitRate(const GUID &audioFormat // Bitrates supported by the MP3 encoder are // 32K, 40K, 48K, 56K, 64K, 80K, 96K, 112K, 128K, 160K, 192K, 224K, 256K, 320K. switch (quality) { - case QMediaEncoderSettings::Quality::VeryLowQuality: + case QMediaRecorder::Quality::VeryLowQuality: return 48000; - case QMediaEncoderSettings::Quality::LowQuality: + case QMediaRecorder::Quality::LowQuality: return 96000; - case QMediaEncoderSettings::Quality::NormalQuality: + case QMediaRecorder::Quality::NormalQuality: return 128000; - case QMediaEncoderSettings::Quality::HighQuality: + case QMediaRecorder::Quality::HighQuality: return 224000; - case QMediaEncoderSettings::Quality::VeryHighQuality: + case QMediaRecorder::Quality::VeryHighQuality: return 320000; } return 128000; diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession_p.h b/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession_p.h index 2a2d04f7c..2db0b0784 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession_p.h +++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession_p.h @@ -53,9 +53,9 @@ #include <private/qtmultimediaglobal_p.h> #include <qcamera.h> -#include <qmediaencodersettings.h> #include <qaudiodevice.h> #include <qwindowsmultimediautils_p.h> +#include <qplatformmediaencoder_p.h> QT_BEGIN_NAMESPACE @@ -114,8 +114,8 @@ private Q_SLOTS: private: quint32 estimateVideoBitRate(const GUID &videoFormat, quint32 width, quint32 height, - qreal frameRate, QMediaEncoderSettings::Quality quality); - quint32 estimateAudioBitRate(const GUID &audioFormat, QMediaEncoderSettings::Quality quality); + qreal frameRate, QMediaRecorder::Quality quality); + quint32 estimateAudioBitRate(const GUID &audioFormat, QMediaRecorder::Quality quality); bool m_active = false; bool m_activating = false; QCameraDevice m_activeCameraDevice; |