summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtem Dyomin <artem.dyomin@qt.io>2022-12-13 13:00:55 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-12-13 22:23:35 +0000
commit610731982c4be01908f72d9af3dd16ab1845adf1 (patch)
treee7522b0644185efe4ee5ab0823c260c40a2fc9df /src
parentcc05db046395fac789b97a1191f2a7b12376196c (diff)
Include moc_*.cpp files in QtMM windows plugin
The reason of the refactoring is following the common approach that leads to reducing compilation time and binary size. - logic hasn't been touched - the same refactorings of main QtMM code, tests, examples, other plugins are coming in the next commits Task-number: QTBUG-103290 Change-Id: I2f9e07cd30d09778bc48b2df7202ef8c06ad398e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 3d3ece9f5fc3e89becaf56eff7faf97cffb1a03d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp6
-rw-r--r--src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp6
-rw-r--r--src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h5
-rw-r--r--src/plugins/multimedia/windows/evr/evrvideowindowcontrol.cpp6
-rw-r--r--src/plugins/multimedia/windows/mediacapture/qwindowscamera.cpp2
-rw-r--r--src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture.cpp2
-rw-r--r--src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture.cpp2
-rw-r--r--src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp2
-rw-r--r--src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp2
-rw-r--r--src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp2
-rw-r--r--src/plugins/multimedia/windows/mfstream.cpp5
-rw-r--r--src/plugins/multimedia/windows/mfstream_p.h4
-rw-r--r--src/plugins/multimedia/windows/player/mfplayersession.cpp1
-rw-r--r--src/plugins/multimedia/windows/sourceresolver.cpp5
14 files changed, 48 insertions, 2 deletions
diff --git a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
index 7b271d089..871478a44 100644
--- a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
+++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
@@ -8,6 +8,8 @@
#include "mfaudiodecodercontrol_p.h"
#include <private/qwindowsaudioutils_p.h>
+QT_BEGIN_NAMESPACE
+
MFAudioDecoderControl::MFAudioDecoderControl(QAudioDecoder *parent)
: QPlatformAudioDecoder(parent)
, m_sourceResolver(new SourceResolver)
@@ -217,3 +219,7 @@ QAudioBuffer MFAudioDecoderControl::read()
return buffer;
}
+
+QT_END_NAMESPACE
+
+#include "moc_mfaudiodecodercontrol_p.cpp"
diff --git a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp
index bc87e59a2..017f3926a 100644
--- a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp
+++ b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp
@@ -7,6 +7,8 @@
#include <qdebug.h>
#include "mfdecodersourcereader_p.h"
+QT_BEGIN_NAMESPACE
+
QWindowsIUPointer<IMFMediaType> MFDecoderSourceReader::setSource(IMFMediaSource *source, QAudioFormat::SampleFormat sampleFormat)
{
QWindowsIUPointer<IMFMediaType> mediaType;
@@ -96,3 +98,7 @@ STDMETHODIMP MFDecoderSourceReader::OnReadSample(HRESULT hrStatus, DWORD dwStrea
}
return S_OK;
}
+
+QT_END_NAMESPACE
+
+#include "moc_mfdecodersourcereader_p.cpp"
diff --git a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h
index 24f2983af..584446ba1 100644
--- a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h
+++ b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h
@@ -23,7 +23,7 @@
#include "qaudioformat.h"
#include <private/qwindowsiupointer_p.h>
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
class MFDecoderSourceReader : public QObject, public IMFSourceReaderCallback
{
@@ -57,4 +57,7 @@ private:
QWindowsIUPointer<IMFSourceReader> m_sourceReader;
};
+
+QT_END_NAMESPACE
+
#endif//MFDECODERSOURCEREADER_H
diff --git a/src/plugins/multimedia/windows/evr/evrvideowindowcontrol.cpp b/src/plugins/multimedia/windows/evr/evrvideowindowcontrol.cpp
index a41b3052e..854c9ddb2 100644
--- a/src/plugins/multimedia/windows/evr/evrvideowindowcontrol.cpp
+++ b/src/plugins/multimedia/windows/evr/evrvideowindowcontrol.cpp
@@ -3,6 +3,8 @@
#include "evrvideowindowcontrol_p.h"
+QT_BEGIN_NAMESPACE
+
EvrVideoWindowControl::EvrVideoWindowControl(QVideoSink *parent)
: QPlatformVideoSink(parent)
, m_windowId(0)
@@ -220,3 +222,7 @@ DXVA2_Fixed32 EvrVideoWindowControl::scaleProcAmpValue(DWORD prop, float value)
return DXVA2FloatToFixed(scaledValue);
}
+
+QT_END_NAMESPACE
+
+#include "moc_evrvideowindowcontrol_p.cpp"
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowscamera.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowscamera.cpp
index 41e09fb4d..d5e25e1c5 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowscamera.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowscamera.cpp
@@ -97,3 +97,5 @@ void QWindowsCamera::onActiveChanged(bool active)
}
QT_END_NAMESPACE
+
+#include "moc_qwindowscamera_p.cpp"
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture.cpp
index f0be9afd2..8b7205d93 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture.cpp
@@ -203,3 +203,5 @@ int QWindowsImageCapture::writerQuality(const QString &writerFormat,
}
QT_END_NAMESPACE
+
+#include "moc_qwindowsimagecapture_p.cpp"
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture.cpp
index e19bcceec..d349b2c43 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture.cpp
@@ -105,3 +105,5 @@ QWindowsMediaDeviceSession *QWindowsMediaCaptureService::session() const
}
QT_END_NAMESPACE
+
+#include "moc_qwindowsmediacapture_p.cpp"
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp
index d5f0c3a39..b1b091d74 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp
@@ -1012,3 +1012,5 @@ STDMETHODIMP QWindowsMediaDeviceReader::OnMarker(DWORD, LPVOID)
}
QT_END_NAMESPACE
+
+#include "moc_qwindowsmediadevicereader_p.cpp"
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp
index 289e48995..f00f4cf31 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp
@@ -364,3 +364,5 @@ quint32 QWindowsMediaDeviceSession::estimateAudioBitRate(const GUID &audioFormat
}
QT_END_NAMESPACE
+
+#include "moc_qwindowsmediadevicesession_p.cpp"
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
index d5eb07980..4a031043d 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
@@ -221,3 +221,5 @@ void QWindowsMediaEncoder::onRecordingStopped()
}
QT_END_NAMESPACE
+
+#include "moc_qwindowsmediaencoder_p.cpp"
diff --git a/src/plugins/multimedia/windows/mfstream.cpp b/src/plugins/multimedia/windows/mfstream.cpp
index 85834af2c..5034f9d9f 100644
--- a/src/plugins/multimedia/windows/mfstream.cpp
+++ b/src/plugins/multimedia/windows/mfstream.cpp
@@ -4,6 +4,7 @@
#include "mfstream_p.h"
#include <QtCore/qcoreapplication.h>
+QT_BEGIN_NAMESPACE
//MFStream is added for supporting QIODevice type of media source.
//It is used to delegate invocations from media foundation(through IMFByteStream) to QIODevice.
@@ -326,3 +327,7 @@ void MFStream::AsyncReadState::setBytesRead(ULONG cbRead)
{
m_cbRead = cbRead;
}
+
+QT_END_NAMESPACE
+
+#include "moc_mfstream_p.cpp"
diff --git a/src/plugins/multimedia/windows/mfstream_p.h b/src/plugins/multimedia/windows/mfstream_p.h
index 37b4b6ae0..b8868a01e 100644
--- a/src/plugins/multimedia/windows/mfstream_p.h
+++ b/src/plugins/multimedia/windows/mfstream_p.h
@@ -22,7 +22,7 @@
#include <QtCore/qcoreevent.h>
#include <QtCore/qpointer.h>
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
class MFStream : public QObject, public IMFByteStream
{
@@ -122,4 +122,6 @@ protected:
IMFAsyncResult *m_currentReadResult;
};
+QT_END_NAMESPACE
+
#endif
diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp
index 58efaa87e..843de044d 100644
--- a/src/plugins/multimedia/windows/player/mfplayersession.cpp
+++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp
@@ -2059,3 +2059,4 @@ QMediaMetaData MFPlayerSession::trackMetaData(QPlatformMediaPlayer::TrackType ty
return m_trackInfo[type].metaData.at(trackNumber);
}
+#include "moc_mfplayersession_p.cpp"
diff --git a/src/plugins/multimedia/windows/sourceresolver.cpp b/src/plugins/multimedia/windows/sourceresolver.cpp
index 4ab1e6a0b..52fb024be 100644
--- a/src/plugins/multimedia/windows/sourceresolver.cpp
+++ b/src/plugins/multimedia/windows/sourceresolver.cpp
@@ -9,6 +9,8 @@
#include <QtCore/qdebug.h>
#include <QtMultimedia/qmediaplayer.h>
+QT_BEGIN_NAMESPACE
+
/*
SourceResolver is separated from MFPlayerSession to handle the work of resolving a media source
asynchronously. You call SourceResolver::load to request resolving a media source asynchronously,
@@ -287,3 +289,6 @@ bool SourceResolver::State::fromStream() const
return m_fromStream;
}
+QT_END_NAMESPACE
+
+#include "moc_sourceresolver_p.cpp"