diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-19 14:35:33 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-19 14:45:09 +0100 |
commit | af2d5a181c3d48e04c2459d551f320cfd7186630 (patch) | |
tree | d7187e0c81d0c300cf4e645eedccd359e27124c3 /src | |
parent | 9a215d954b00b6d07568392a1894341027c1af5a (diff) | |
parent | 4ab105b89e13c746b08fb807e2104bfca05e88f1 (diff) | |
download | qtmultimedia-af2d5a181c3d48e04c2459d551f320cfd7186630.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/plugins/gstreamer/camerabin/camerabinsession.cpp
Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26
Diffstat (limited to 'src')
-rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 3 | ||||
-rw-r--r-- | src/plugins/alsa/qalsaaudioinput.cpp | 14 | ||||
-rw-r--r-- | src/plugins/alsa/qalsaaudioinput.h | 8 | ||||
-rw-r--r-- | src/plugins/alsa/qalsaaudiooutput.cpp | 10 | ||||
-rw-r--r-- | src/plugins/alsa/qalsaaudiooutput.h | 8 | ||||
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 35 | ||||
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinviewfindersettings.cpp | 28 | ||||
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h | 4 | ||||
-rw-r--r-- | src/plugins/pulseaudio/qaudioinput_pulse.cpp | 12 | ||||
-rw-r--r-- | src/plugins/pulseaudio/qaudioinput_pulse.h | 8 | ||||
-rw-r--r-- | src/plugins/pulseaudio/qaudiooutput_pulse.cpp | 8 | ||||
-rw-r--r-- | src/plugins/pulseaudio/qaudiooutput_pulse.h | 8 | ||||
-rw-r--r-- | src/plugins/videonode/imx6/qsgvivantevideonode.cpp | 1 | ||||
-rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | 13 | ||||
-rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp | 25 |
15 files changed, 119 insertions, 66 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index d8088621d..8dd23d2f5 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -902,10 +902,13 @@ QVideoFrame::PixelFormat QVideoFrame::pixelFormatFromImageFormat(QImage::Format { switch (format) { case QImage::Format_RGB32: + case QImage::Format_RGBX8888: return Format_RGB32; case QImage::Format_ARGB32: + case QImage::Format_RGBA8888: return Format_ARGB32; case QImage::Format_ARGB32_Premultiplied: + case QImage::Format_RGBA8888_Premultiplied: return Format_ARGB32_Premultiplied; case QImage::Format_RGB16: return Format_RGB565; diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp index adaa41c6e..a0a7bf08f 100644 --- a/src/plugins/alsa/qalsaaudioinput.cpp +++ b/src/plugins/alsa/qalsaaudioinput.cpp @@ -244,7 +244,7 @@ QIODevice* QAlsaAudioInput::start() delete audioSource; pullMode = false; - audioSource = new InputPrivate(this); + audioSource = new AlsaInputPrivate(this); audioSource->open(QIODevice::ReadOnly | QIODevice::Unbuffered); deviceState = QAudio::IdleState; @@ -725,7 +725,7 @@ bool QAlsaAudioInput::deviceReady() read(0, buffer_size); } else { // emits readyRead() so user will call read() on QIODevice to get some audio data - InputPrivate* a = qobject_cast<InputPrivate*>(audioSource); + AlsaInputPrivate* a = qobject_cast<AlsaInputPrivate*>(audioSource); a->trigger(); } bytesAvailable = checkBytesReady(); @@ -777,28 +777,28 @@ void QAlsaAudioInput::drain() snd_pcm_drain(handle); } -InputPrivate::InputPrivate(QAlsaAudioInput* audio) +AlsaInputPrivate::AlsaInputPrivate(QAlsaAudioInput* audio) { audioDevice = qobject_cast<QAlsaAudioInput*>(audio); } -InputPrivate::~InputPrivate() +AlsaInputPrivate::~AlsaInputPrivate() { } -qint64 InputPrivate::readData( char* data, qint64 len) +qint64 AlsaInputPrivate::readData( char* data, qint64 len) { return audioDevice->read(data,len); } -qint64 InputPrivate::writeData(const char* data, qint64 len) +qint64 AlsaInputPrivate::writeData(const char* data, qint64 len) { Q_UNUSED(data) Q_UNUSED(len) return 0; } -void InputPrivate::trigger() +void AlsaInputPrivate::trigger() { emit readyRead(); } diff --git a/src/plugins/alsa/qalsaaudioinput.h b/src/plugins/alsa/qalsaaudioinput.h index 19af68950..1c09dc70f 100644 --- a/src/plugins/alsa/qalsaaudioinput.h +++ b/src/plugins/alsa/qalsaaudioinput.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -class InputPrivate; +class AlsaInputPrivate; class RingBuffer { @@ -158,12 +158,12 @@ private: qreal m_volume; }; -class InputPrivate : public QIODevice +class AlsaInputPrivate : public QIODevice { Q_OBJECT public: - InputPrivate(QAlsaAudioInput* audio); - ~InputPrivate(); + AlsaInputPrivate(QAlsaAudioInput* audio); + ~AlsaInputPrivate(); qint64 readData( char* data, qint64 len); qint64 writeData(const char* data, qint64 len); diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp index fde2bc9bf..c9c024aed 100644 --- a/src/plugins/alsa/qalsaaudiooutput.cpp +++ b/src/plugins/alsa/qalsaaudiooutput.cpp @@ -247,7 +247,7 @@ QIODevice* QAlsaAudioOutput::start() close(); - audioSource = new OutputPrivate(this); + audioSource = new AlsaOutputPrivate(this); audioSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered); pullMode = false; @@ -785,14 +785,14 @@ void QAlsaAudioOutput::reset() stop(); } -OutputPrivate::OutputPrivate(QAlsaAudioOutput* audio) +AlsaOutputPrivate::AlsaOutputPrivate(QAlsaAudioOutput* audio) { audioDevice = qobject_cast<QAlsaAudioOutput*>(audio); } -OutputPrivate::~OutputPrivate() {} +AlsaOutputPrivate::~AlsaOutputPrivate() {} -qint64 OutputPrivate::readData( char* data, qint64 len) +qint64 AlsaOutputPrivate::readData( char* data, qint64 len) { Q_UNUSED(data) Q_UNUSED(len) @@ -800,7 +800,7 @@ qint64 OutputPrivate::readData( char* data, qint64 len) return 0; } -qint64 OutputPrivate::writeData(const char* data, qint64 len) +qint64 AlsaOutputPrivate::writeData(const char* data, qint64 len) { int retry = 0; qint64 written = 0; diff --git a/src/plugins/alsa/qalsaaudiooutput.h b/src/plugins/alsa/qalsaaudiooutput.h index 243729f7e..be2adb840 100644 --- a/src/plugins/alsa/qalsaaudiooutput.h +++ b/src/plugins/alsa/qalsaaudiooutput.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE class QAlsaAudioOutput : public QAbstractAudioOutput { - friend class OutputPrivate; + friend class AlsaOutputPrivate; Q_OBJECT public: QAlsaAudioOutput(const QByteArray &device); @@ -137,13 +137,13 @@ private: qreal m_volume; }; -class OutputPrivate : public QIODevice +class AlsaOutputPrivate : public QIODevice { friend class QAlsaAudioOutput; Q_OBJECT public: - OutputPrivate(QAlsaAudioOutput* audio); - ~OutputPrivate(); + AlsaOutputPrivate(QAlsaAudioOutput* audio); + ~AlsaOutputPrivate(); qint64 readData( char* data, qint64 len); qint64 writeData(const char* data, qint64 len); diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index f916b58c7..4517145ed 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -315,6 +315,7 @@ void CameraBinSession::setupCaptureResolution() if (!viewfinderResolution.isEmpty()) resolution = viewfinderResolution; + { GstCaps *caps = resolutionToCaps(resolution); #if CAMERABIN_DEBUG @@ -323,6 +324,40 @@ void CameraBinSession::setupCaptureResolution() g_object_set(m_camerabin, VIEWFINDER_CAPS_PROPERTY, caps, NULL); if (caps) gst_caps_unref(caps); + + GstElement *mfw_v4lsrc = 0; + if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_videoSrc), "video-source")) { + GstElement *videoSrc = 0; + g_object_get(G_OBJECT(m_videoSrc), "video-source", &videoSrc, NULL); + if (videoSrc) { + const char *name = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(gst_element_get_factory(videoSrc))); + if (!qstrcmp(name, "mfw_v4lsrc")) + mfw_v4lsrc = videoSrc; + } + } + + if (mfw_v4lsrc) { + int capMode = 0; + if (resolution == QSize(320, 240)) + capMode = 1; + else if (resolution == QSize(720, 480)) + capMode = 2; + else if (resolution == QSize(720, 576)) + capMode = 3; + else if (resolution == QSize(1280, 720)) + capMode = 4; + else if (resolution == QSize(1920, 1080)) + capMode = 5; + g_object_set(G_OBJECT(mfw_v4lsrc), "capture-mode", capMode, NULL); + + const qreal maxFps = m_viewfinderSettingsControl->maximumFrameRate(); + if (!qFuzzyIsNull(maxFps)) { + int n, d; + gst_util_double_to_fraction(maxFps, &n, &d); + g_object_set(G_OBJECT(mfw_v4lsrc), "fps-n", n, NULL); + g_object_set(G_OBJECT(mfw_v4lsrc), "fps-d", d, NULL); + } + } } if (m_videoEncoder) diff --git a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.cpp b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.cpp index 3f7d2f0cf..c5cdee40e 100644 --- a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.cpp @@ -38,7 +38,9 @@ QT_BEGIN_NAMESPACE CameraBinViewfinderSettings::CameraBinViewfinderSettings(QObject *parent) - : QCameraViewfinderSettingsControl(parent) + : QCameraViewfinderSettingsControl(parent), + m_minimumFrameRate(0), + m_maximumFrameRate(0) { } @@ -50,10 +52,10 @@ bool CameraBinViewfinderSettings::isViewfinderParameterSupported(ViewfinderParam { switch (parameter) { case Resolution: - return true; - case PixelAspectRatio: case MinimumFrameRate: case MaximumFrameRate: + return true; + case PixelAspectRatio: case PixelFormat: case UserParameter: return false; @@ -66,9 +68,11 @@ QVariant CameraBinViewfinderSettings::viewfinderParameter(ViewfinderParameter pa switch (parameter) { case Resolution: return m_resolution; - case PixelAspectRatio: case MinimumFrameRate: + return m_minimumFrameRate; case MaximumFrameRate: + return m_maximumFrameRate; + case PixelAspectRatio: case PixelFormat: case UserParameter: return QVariant(); @@ -82,9 +86,13 @@ void CameraBinViewfinderSettings::setViewfinderParameter(ViewfinderParameter par case Resolution: m_resolution = value.toSize(); break; - case PixelAspectRatio: case MinimumFrameRate: + m_minimumFrameRate = value.toFloat(); + break; case MaximumFrameRate: + m_maximumFrameRate = value.toFloat(); + break; + case PixelAspectRatio: case PixelFormat: case UserParameter: break; @@ -96,4 +104,14 @@ QSize CameraBinViewfinderSettings::resolution() const return m_resolution; } +qreal CameraBinViewfinderSettings::minimumFrameRate() const +{ + return m_minimumFrameRate; +} + +qreal CameraBinViewfinderSettings::maximumFrameRate() const +{ + return m_maximumFrameRate; +} + QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h index a6d425338..c5030ffb4 100644 --- a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h +++ b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h @@ -52,9 +52,13 @@ public: void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value); QSize resolution() const; + qreal minimumFrameRate() const; + qreal maximumFrameRate() const; private: QSize m_resolution; + qreal m_minimumFrameRate; + qreal m_maximumFrameRate; }; QT_END_NAMESPACE diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.cpp b/src/plugins/pulseaudio/qaudioinput_pulse.cpp index ea053578f..fe20e061b 100644 --- a/src/plugins/pulseaudio/qaudioinput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudioinput_pulse.cpp @@ -248,7 +248,7 @@ QIODevice *QPulseAudioInput::start() return Q_NULLPTR; m_pullMode = false; - m_audioSource = new InputPrivate(this); + m_audioSource = new PulseInputPrivate(this); m_audioSource->open(QIODevice::ReadOnly | QIODevice::Unbuffered); setState(QAudio::IdleState); @@ -661,7 +661,7 @@ bool QPulseAudioInput::deviceReady() } else { // emits readyRead() so user will call read() on QIODevice to get some audio data if (m_audioSource != 0) { - InputPrivate *a = qobject_cast<InputPrivate*>(m_audioSource); + PulseInputPrivate *a = qobject_cast<PulseInputPrivate*>(m_audioSource); a->trigger(); } } @@ -701,24 +701,24 @@ void QPulseAudioInput::onPulseContextFailed() setState(QAudio::StoppedState); } -InputPrivate::InputPrivate(QPulseAudioInput *audio) +PulseInputPrivate::PulseInputPrivate(QPulseAudioInput *audio) { m_audioDevice = qobject_cast<QPulseAudioInput*>(audio); } -qint64 InputPrivate::readData(char *data, qint64 len) +qint64 PulseInputPrivate::readData(char *data, qint64 len) { return m_audioDevice->read(data, len); } -qint64 InputPrivate::writeData(const char *data, qint64 len) +qint64 PulseInputPrivate::writeData(const char *data, qint64 len) { Q_UNUSED(data) Q_UNUSED(len) return 0; } -void InputPrivate::trigger() +void PulseInputPrivate::trigger() { emit readyRead(); } diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.h b/src/plugins/pulseaudio/qaudioinput_pulse.h index 4e92447f6..8590aa281 100644 --- a/src/plugins/pulseaudio/qaudioinput_pulse.h +++ b/src/plugins/pulseaudio/qaudioinput_pulse.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE -class InputPrivate; +class PulseInputPrivate; class QPulseAudioInput : public QAbstractAudioInput { @@ -139,12 +139,12 @@ private: pa_sample_spec m_spec; }; -class InputPrivate : public QIODevice +class PulseInputPrivate : public QIODevice { Q_OBJECT public: - InputPrivate(QPulseAudioInput *audio); - ~InputPrivate() {}; + PulseInputPrivate(QPulseAudioInput *audio); + ~PulseInputPrivate() {}; qint64 readData(char *data, qint64 len); qint64 writeData(const char *data, qint64 len); diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp index b979450b6..3ac6ffc33 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -237,7 +237,7 @@ QIODevice *QPulseAudioOutput::start() if (!open()) return Q_NULLPTR; - m_audioSource = new OutputPrivate(this); + m_audioSource = new PulseOutputPrivate(this); m_audioSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered); m_pullMode = false; @@ -604,12 +604,12 @@ void QPulseAudioOutput::reset() stop(); } -OutputPrivate::OutputPrivate(QPulseAudioOutput *audio) +PulseOutputPrivate::PulseOutputPrivate(QPulseAudioOutput *audio) { m_audioDevice = qobject_cast<QPulseAudioOutput*>(audio); } -qint64 OutputPrivate::readData(char *data, qint64 len) +qint64 PulseOutputPrivate::readData(char *data, qint64 len) { Q_UNUSED(data) Q_UNUSED(len) @@ -617,7 +617,7 @@ qint64 OutputPrivate::readData(char *data, qint64 len) return 0; } -qint64 OutputPrivate::writeData(const char *data, qint64 len) +qint64 PulseOutputPrivate::writeData(const char *data, qint64 len) { int retry = 0; qint64 written = 0; diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.h b/src/plugins/pulseaudio/qaudiooutput_pulse.h index 2883ae5c3..15208b2f4 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.h +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QPulseAudioOutput : public QAbstractAudioOutput { - friend class OutputPrivate; + friend class PulseOutputPrivate; Q_OBJECT public: @@ -140,14 +140,14 @@ private: pa_sample_spec m_spec; }; -class OutputPrivate : public QIODevice +class PulseOutputPrivate : public QIODevice { friend class QPulseAudioOutput; Q_OBJECT public: - OutputPrivate(QPulseAudioOutput *audio); - virtual ~OutputPrivate() {} + PulseOutputPrivate(QPulseAudioOutput *audio); + virtual ~PulseOutputPrivate() {} protected: qint64 readData(char *data, qint64 len); diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp index a42b577d5..1c1c1008b 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp @@ -61,6 +61,7 @@ void QSGVivanteVideoNode::setCurrentFrame(const QVideoFrame &frame) const QMap<QVideoFrame::PixelFormat, GLenum>& QSGVivanteVideoNode::getVideoFormat2GLFormatMap() { if (static_VideoFormat2GLFormatMap.isEmpty()) { + static_VideoFormat2GLFormatMap.insert(QVideoFrame::Format_YUV420P, GL_VIV_I420); static_VideoFormat2GLFormatMap.insert(QVideoFrame::Format_YV12, GL_VIV_YV12); static_VideoFormat2GLFormatMap.insert(QVideoFrame::Format_NV12, GL_VIV_NV12); static_VideoFormat2GLFormatMap.insert(QVideoFrame::Format_NV21, GL_VIV_NV21); diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index d7aab6915..9a9256868 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -39,11 +39,12 @@ #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediaservice.h> #include <private/qmediapluginloader_p.h> - -//#define DEBUG_VIDEOITEM +#include <QtCore/qloggingcategory.h> QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(qLcVideo, "qt.multimedia.video") + /*! \qmltype VideoOutput \instantiates QDeclarativeVideoOutput @@ -154,9 +155,7 @@ QDeclarativeVideoOutput::~QDeclarativeVideoOutput() void QDeclarativeVideoOutput::setSource(QObject *source) { -#ifdef DEBUG_VIDEOITEM - qDebug() << Q_FUNC_INFO << source; -#endif + qCDebug(qLcVideo) << "source is" << source; if (source == m_source.data()) return; @@ -273,9 +272,7 @@ void QDeclarativeVideoOutput::_q_updateMediaObject() if (m_source) mediaObject = qobject_cast<QMediaObject*>(m_source.data()->property("mediaObject").value<QObject*>()); -#ifdef DEBUG_VIDEOITEM - qDebug() << Q_FUNC_INFO << mediaObject; -#endif + qCDebug(qLcVideo) << "media object is" << mediaObject; if (m_mediaObject.data() == mediaObject) return; diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp index 608aae5d1..657ef1767 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp @@ -36,6 +36,7 @@ #include "qdeclarativevideooutput_p.h" #include <QtMultimedia/qvideorenderercontrol.h> #include <QtMultimedia/qmediaservice.h> +#include <QtCore/qloggingcategory.h> #include <private/qmediapluginloader_p.h> #include <private/qsgvideonode_p.h> @@ -43,6 +44,8 @@ QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(qLcVideo) + Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, videoNodeFactoryLoader, (QSGVideoNodeFactoryInterface_iid, QLatin1String("video/videonode"), Qt::CaseInsensitive)) @@ -66,9 +69,7 @@ QDeclarativeVideoRendererBackend::QDeclarativeVideoRendererBackend(QDeclarativeV m_videoNodeFactories.prepend(plugin); else m_videoNodeFactories.append(plugin); -#ifdef DEBUG_VIDEOITEM - qDebug() << "found videonode plugin" << key << plugin; -#endif + qCDebug(qLcVideo) << "found videonode plugin" << key << plugin; } } @@ -217,17 +218,13 @@ QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode, if (m_frameChanged) { if (videoNode && videoNode->pixelFormat() != m_frame.pixelFormat()) { -#ifdef DEBUG_VIDEOITEM - qDebug() << "updatePaintNode: deleting old video node because frame format changed..."; -#endif + qCDebug(qLcVideo) << "updatePaintNode: deleting old video node because frame format changed"; delete videoNode; videoNode = 0; } if (!m_frame.isValid()) { -#ifdef DEBUG_VIDEOITEM - qDebug() << "updatePaintNode: no frames yet... aborting..."; -#endif + qCDebug(qLcVideo) << "updatePaintNode: no frames yet"; m_frameChanged = false; return 0; } @@ -236,9 +233,9 @@ QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode, foreach (QSGVideoNodeFactoryInterface* factory, m_videoNodeFactories) { videoNode = factory->createNode(m_surface->surfaceFormat()); if (videoNode) { -#ifdef DEBUG_VIDEOITEM - qDebug() << "using video node from factory" << factory; -#endif + qCDebug(qLcVideo) << "updatePaintNode: Video node created. Handle type:" << m_frame.handleType() + << " Supported formats for the handle by this node:" + << factory->supportedPixelFormats(m_frame.handleType()); break; } } @@ -327,9 +324,7 @@ QList<QVideoFrame::PixelFormat> QSGVideoItemSurface::supportedPixelFormats( bool QSGVideoItemSurface::start(const QVideoSurfaceFormat &format) { -#ifdef DEBUG_VIDEOITEM - qDebug() << Q_FUNC_INFO << format << supportedPixelFormats(format.handleType()); -#endif + qCDebug(qLcVideo) << "Video surface format:" << format << "all supported formats:" << supportedPixelFormats(format.handleType()); if (!supportedPixelFormats(format.handleType()).contains(format.pixelFormat())) return false; |