diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2023-01-12 10:52:36 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-12 13:49:40 +0000 |
commit | 0d92f06831407b52d25273f2572fc91ca90ac5ec (patch) | |
tree | bfc40fa63994d1cdc666e14c2daac73505fdb4e1 | |
parent | efb90dbca188244d4f696e58321f2a4d7ac155c2 (diff) | |
download | qtmultimedia-0d92f06831407b52d25273f2572fc91ca90ac5ec.tar.gz |
Don't define same logging category in both plugins
Both ffmpeg and gstreamer plugins define the same logging category,
which breaks application linking when using static linking:
error: /usr/lib/plugins/multimedia/libgstreamermediaplugin.a(qgstreamerimagecapture.cpp.o): multiple definition of 'qLcImageCapture()'
/usr/lib/plugins/multimedia/libffmpegmediaplugin.a(qffmpegimagecapture.cpp.o): previous definition here
Fixes: QTBUG-109613
Change-Id: I9dd573fe8412ec0ea9144ec4a56f5680060cec16
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 24eb3e2a8859eeff73c4954ff2a3d366a7ab0511)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
3 files changed, 21 insertions, 21 deletions
diff --git a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture.cpp b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture.cpp index 04a65d899..92bda67f2 100644 --- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture.cpp +++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture.cpp @@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcImageCapture, "qt.multimedia.imageCapture") +Q_LOGGING_CATEGORY(qLcImageCaptureGst, "qt.multimedia.imageCapture") QGstreamerImageCapture::QGstreamerImageCapture(QImageCapture *parent) : QPlatformImageCapture(parent), @@ -75,7 +75,7 @@ int QGstreamerImageCapture::captureToBuffer() int QGstreamerImageCapture::doCapture(const QString &fileName) { - qCDebug(qLcImageCapture) << "do capture"; + qCDebug(qLcImageCaptureGst) << "do capture"; if (!m_session) { //emit error in the next event loop, //so application can associate it with returned request id. @@ -84,7 +84,7 @@ int QGstreamerImageCapture::doCapture(const QString &fileName) Q_ARG(int, QImageCapture::ResourceError), Q_ARG(QString, QPlatformImageCapture::msgImageCaptureNotSet())); - qCDebug(qLcImageCapture) << "error 1"; + qCDebug(qLcImageCaptureGst) << "error 1"; return -1; } if (!m_session->camera()) { @@ -95,7 +95,7 @@ int QGstreamerImageCapture::doCapture(const QString &fileName) Q_ARG(int, QImageCapture::ResourceError), Q_ARG(QString,tr("No camera available."))); - qCDebug(qLcImageCapture) << "error 2"; + qCDebug(qLcImageCaptureGst) << "error 2"; return -1; } if (passImage) { @@ -106,7 +106,7 @@ int QGstreamerImageCapture::doCapture(const QString &fileName) Q_ARG(int, QImageCapture::NotReadyError), Q_ARG(QString, QPlatformImageCapture::msgCameraNotReady())); - qCDebug(qLcImageCapture) << "error 3"; + qCDebug(qLcImageCaptureGst) << "error 3"; return -1; } m_lastId++; @@ -123,7 +123,7 @@ bool QGstreamerImageCapture::probeBuffer(GstBuffer *buffer) { if (!passImage) return false; - qCDebug(qLcImageCapture) << "probe buffer"; + qCDebug(qLcImageCaptureGst) << "probe buffer"; passImage = false; @@ -148,7 +148,7 @@ bool QGstreamerImageCapture::probeBuffer(GstBuffer *buffer) emit imageExposed(imageData.id); - qCDebug(qLcImageCapture) << "Image available!"; + qCDebug(qLcImageCaptureGst) << "Image available!"; emit imageAvailable(imageData.id, frame); emit imageCaptured(imageData.id, img); @@ -195,11 +195,11 @@ void QGstreamerImageCapture::setCaptureSession(QPlatformMediaCaptureSession *ses void QGstreamerImageCapture::cameraActiveChanged(bool active) { - qCDebug(qLcImageCapture) << "cameraActiveChanged" << cameraActive << active; + qCDebug(qLcImageCaptureGst) << "cameraActiveChanged" << cameraActive << active; if (cameraActive == active) return; cameraActive = active; - qCDebug(qLcImageCapture) << "isReady" << isReadyForCapture(); + qCDebug(qLcImageCaptureGst) << "isReady" << isReadyForCapture(); emit readyForCaptureChanged(isReadyForCapture()); } @@ -233,7 +233,7 @@ gboolean QGstreamerImageCapture::saveImageFilter(GstElement *element, return true; } - qCDebug(qLcImageCapture) << "saving image as" << imageData.filename; + qCDebug(qLcImageCaptureGst) << "saving image as" << imageData.filename; QFile f(imageData.filename); if (f.open(QFile::WriteOnly)) { @@ -250,7 +250,7 @@ gboolean QGstreamerImageCapture::saveImageFilter(GstElement *element, Q_ARG(int, imageData.id), Q_ARG(QString, imageData.filename)); } else { - qCDebug(qLcImageCapture) << " could not open image file for writing"; + qCDebug(qLcImageCaptureGst) << " could not open image file for writing"; } return TRUE; diff --git a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacapture.cpp b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacapture.cpp index 5f4899161..a47954660 100644 --- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacapture.cpp +++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacapture.cpp @@ -15,7 +15,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcMediaCapture, "qt.multimedia.capture") +Q_LOGGING_CATEGORY(qLcMediaCaptureGst, "qt.multimedia.capture") static void linkTeeToPad(QGstElement tee, QGstPad sink) diff --git a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediaencoder.cpp b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediaencoder.cpp index 5f3631111..b3a37b479 100644 --- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediaencoder.cpp +++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamermediaencoder.cpp @@ -21,7 +21,7 @@ #include <gst/video/video.h> #include <gst/pbutils/encoding-profile.h> -Q_LOGGING_CATEGORY(qLcMediaEncoder, "qt.multimedia.encoder") +Q_LOGGING_CATEGORY(qLcMediaEncoderGst, "qt.multimedia.encoder") QT_BEGIN_NAMESPACE @@ -60,17 +60,17 @@ bool QGstreamerMediaEncoder::processBusMessage(const QGstreamerMessage &message) return false; auto msg = message; -// qCDebug(qLcMediaEncoder) << "received event from" << message.source().name() << Qt::hex << message.type(); +// qCDebug(qLcMediaEncoderGst) << "received event from" << message.source().name() << Qt::hex << message.type(); // if (message.type() == GST_MESSAGE_STATE_CHANGED) { // GstState oldState; // GstState newState; // GstState pending; // gst_message_parse_state_changed(gm, &oldState, &newState, &pending); -// qCDebug(qLcMediaEncoder) << "received state change from" << message.source().name() << oldState << newState << pending; +// qCDebug(qLcMediaEncoderGst) << "received state change from" << message.source().name() << oldState << newState << pending; // } if (msg.type() == GST_MESSAGE_ELEMENT) { QGstStructure s = msg.structure(); - qCDebug(qLcMediaEncoder) << "received element message from" << msg.source().name() << s.name(); + qCDebug(qLcMediaEncoderGst) << "received element message from" << msg.source().name() << s.name(); if (s.name() == "GstBinForwarded") msg = QGstreamerMessage(s); if (msg.isNull()) @@ -78,7 +78,7 @@ bool QGstreamerMediaEncoder::processBusMessage(const QGstreamerMessage &message) } if (msg.type() == GST_MESSAGE_EOS) { - qCDebug(qLcMediaEncoder) << "received EOS from" << msg.source().name(); + qCDebug(qLcMediaEncoderGst) << "received EOS from" << msg.source().name(); finalize(); return false; } @@ -258,7 +258,7 @@ void QGstreamerMediaEncoder::record(QMediaEncoderSettings &settings) auto location = QMediaStorageLocation::generateFileName(outputLocation().toLocalFile(), primaryLocation, container); QUrl actualSink = QUrl::fromLocalFile(QDir::currentPath()).resolved(location); - qCDebug(qLcMediaEncoder) << "recording new video to" << actualSink; + qCDebug(qLcMediaEncoderGst) << "recording new video to" << actualSink; Q_ASSERT(!actualSink.isEmpty()); @@ -332,12 +332,12 @@ void QGstreamerMediaEncoder::stop() { if (!m_session || m_finalizing || state() == QMediaRecorder::StoppedState) return; - qCDebug(qLcMediaEncoder) << "stop"; + qCDebug(qLcMediaEncoderGst) << "stop"; m_finalizing = true; m_session->unlinkEncoder(); signalDurationChangedTimer.stop(); - qCDebug(qLcMediaEncoder) << ">>>>>>>>>>>>> sending EOS"; + qCDebug(qLcMediaEncoderGst) << ">>>>>>>>>>>>> sending EOS"; gstEncoder.sendEos(); } @@ -346,7 +346,7 @@ void QGstreamerMediaEncoder::finalize() if (!m_session || gstEncoder.isNull()) return; - qCDebug(qLcMediaEncoder) << "finalize"; + qCDebug(qLcMediaEncoderGst) << "finalize"; gstPipeline.remove(gstEncoder); gstPipeline.remove(gstFileSink); |