diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-12 16:10:32 +0100 |
---|---|---|
committer | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-15 08:32:36 +0000 |
commit | 47edca19681309ef79aebb20e9226384cf2c046b (patch) | |
tree | 6a472988d6f922c36200bdc4847792e25872cce4 /src | |
parent | f70b19a137518679f0ca4a5f9bc9009f28f8ed68 (diff) |
Include moc_*.cpp files in QtMM ffmpeg 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: Idab09ddd6bda4f74fb395e1b0876c88f0910c710
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit a3c36e681d6036f053fed01526ed5db4ba6d713a)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src')
9 files changed, 22 insertions, 0 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder.cpp b/src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder.cpp index 4dff93d12..393a70c61 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder.cpp @@ -262,4 +262,6 @@ void QFFmpegAudioDecoder::errorSignal(int err, const QString &errorString) QT_END_NAMESPACE +#include "moc_qffmpegaudiodecoder_p.cpp" + #include "qffmpegaudiodecoder.moc" diff --git a/src/plugins/multimedia/ffmpeg/qffmpegaudioinput.cpp b/src/plugins/multimedia/ffmpeg/qffmpegaudioinput.cpp index 5c769d524..8872e87df 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegaudioinput.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegaudioinput.cpp @@ -186,4 +186,6 @@ void QFFmpegAudioInput::setRunning(bool b) QT_END_NAMESPACE +#include "moc_qffmpegaudioinput_p.cpp" + #include "qffmpegaudioinput.moc" diff --git a/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp b/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp index b0211c31d..443edcd0d 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp @@ -1266,3 +1266,5 @@ void Decoder::streamAtEnd() } QT_END_NAMESPACE + +#include "moc_qffmpegdecoder_p.cpp" diff --git a/src/plugins/multimedia/ffmpeg/qffmpegencoder.cpp b/src/plugins/multimedia/ffmpeg/qffmpegencoder.cpp index 58888f27e..b65932c9e 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegencoder.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegencoder.cpp @@ -555,3 +555,5 @@ void VideoEncoder::loop() } QT_END_NAMESPACE + +#include "moc_qffmpegencoder_p.cpp" diff --git a/src/plugins/multimedia/ffmpeg/qffmpegimagecapture.cpp b/src/plugins/multimedia/ffmpeg/qffmpegimagecapture.cpp index 9ee4e1db8..0e6de095f 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegimagecapture.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegimagecapture.cpp @@ -267,3 +267,5 @@ void QFFmpegImageCapture::setImageSettings(const QImageEncoderSettings &settings } QT_END_NAMESPACE + +#include "moc_qffmpegimagecapture_p.cpp" diff --git a/src/plugins/multimedia/ffmpeg/qffmpegmediacapturesession.cpp b/src/plugins/multimedia/ffmpeg/qffmpegmediacapturesession.cpp index 3d5fbc039..cb28aeee7 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegmediacapturesession.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegmediacapturesession.cpp @@ -123,3 +123,5 @@ void QFFmpegMediaCaptureSession::newVideoFrame(const QVideoFrame &frame) QT_END_NAMESPACE + +#include "moc_qffmpegmediacapturesession_p.cpp" diff --git a/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer.cpp b/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer.cpp index 5e6062f42..7851cc159 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer.cpp @@ -234,3 +234,5 @@ void QFFmpegMediaPlayer::setActiveTrack(TrackType type, int streamNumber) } QT_END_NAMESPACE + +#include "moc_qffmpegmediaplayer_p.cpp" diff --git a/src/plugins/multimedia/ffmpeg/qffmpegmediarecorder.cpp b/src/plugins/multimedia/ffmpeg/qffmpegmediarecorder.cpp index 870b8ad38..7d660214a 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegmediarecorder.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegmediarecorder.cpp @@ -19,6 +19,8 @@ Q_LOGGING_CATEGORY(qLcMediaEncoder, "qt.multimedia.encoder") +QT_BEGIN_NAMESPACE + QFFmpegMediaRecorder::QFFmpegMediaRecorder(QMediaRecorder *parent) : QPlatformMediaRecorder(parent) { @@ -155,3 +157,7 @@ void QFFmpegMediaRecorder::setCaptureSession(QPlatformMediaCaptureSession *sessi if (!m_session) return; } + +QT_END_NAMESPACE + +#include "moc_qffmpegmediarecorder_p.cpp" diff --git a/src/plugins/multimedia/ffmpeg/qffmpegvideosink.cpp b/src/plugins/multimedia/ffmpeg/qffmpegvideosink.cpp index 3cb31b473..ec99d8dd2 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegvideosink.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegvideosink.cpp @@ -29,3 +29,5 @@ void QFFmpegVideoSink::setVideoFrame(const QVideoFrame &frame) } QT_END_NAMESPACE + +#include "moc_qffmpegvideosink_p.cpp" |