From daa8e229dae3b1bc727428f9836c9ae026d357f5 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 23 Mar 2013 15:22:21 +0100 Subject: [PATCH 1/5] Disable FFT when building in static mode This is because fftreal's pro file says: static: error(This library cannot be built for static linkage) Found due to a CI failure on win32-msvc2010_static_Windows_7. Change-Id: I2a4630410fa7a1bb4e6ab158a4f7ae76d5cacd8a Reviewed-by: Holger Ihrig Reviewed-by: Yoann Lopes --- examples/multimedia/spectrum/spectrum.pri | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/multimedia/spectrum/spectrum.pri b/examples/multimedia/spectrum/spectrum.pri index 75c01131..38b3f150 100644 --- a/examples/multimedia/spectrum/spectrum.pri +++ b/examples/multimedia/spectrum/spectrum.pri @@ -23,6 +23,8 @@ DEFINES += LOG_ENGINE # If this macro is defined, the FFTReal DLL will not be built #DEFINES += DISABLE_FFT +static: DEFINES += DISABLE_FFT + # Disables rendering of the waveform #DEFINES += DISABLE_WAVEFORM From 2d8ad6066d59075ebb20ae880af00eaba027d5e9 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 25 Mar 2013 12:55:10 +0100 Subject: [PATCH 2/5] Add changes-5.0.2 file Change-Id: Ic13e37a08fdb391796416ba3a9ea7aabe7934835 Reviewed-by: Yoann Lopes Reviewed-by: Iikka Eklund --- dist/changes-5.0.2 | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 dist/changes-5.0.2 diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2 new file mode 100644 index 00000000..53d93e69 --- /dev/null +++ b/dist/changes-5.0.2 @@ -0,0 +1,48 @@ +Qt 5.0.2 is a bug-fix release. It maintains both forward and backward +source compatibility with Qt 5.0.0 and 5.0.1. + +However, to fix a bug we detected after the 5.0 release, this release +has a limited binary compatibility break. We therefore recommend all +users to recompile their applications that provided QtMultimedia +plugins or dealt with them directly. This is an exceptional case: +compatibility will be kept for further releases. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.0/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + +General Improvements +-------------------- + +**************************************************************************** +* Library * +**************************************************************************** + + - WMF: Enabled HW-accelerated video decoding for the QML video item. + - WMF: Fixed unresolved topologies when using the custom MediaSink. + - Disable FFT when building in static mode. + - [QTBUG-28741] Added seek() function to QML Video item. + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Qt for BlackBerry +----------------- + + - Fixed playback of streamed audio. + From 7a4ea3035087d6eafe96f8ec304bef95b3a74ea0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 25 Jan 2013 13:45:06 -0800 Subject: [PATCH 3/5] Fix warnings in qtmultimedia /camerabinresourcepolicy.cpp:100:42: error: unused variable 'oldSet' [-Werror=unused-variable] camerabincontrol.cpp:167:54: error: 'resourceSet' may be used uninitialized in this function [-Werror=maybe-uninitialized] qaudiooutput_pulse.cpp:416:20: error: unused variable 'bytesWritten' [-Werror=unused-variable] Change-Id: Idafd85b7985673f1f22d868b5f1b1e46a60ada4a Reviewed-by: Christian Stromme --- src/plugins/gstreamer/camerabin/camerabincontrol.cpp | 2 +- src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp | 2 ++ src/plugins/pulseaudio/qaudiooutput_pulse.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp index 202f7a22..62006064 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp +++ b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp @@ -149,7 +149,7 @@ void CameraBinControl::setState(QCamera::State state) return; } - CamerabinResourcePolicy::ResourceSet resourceSet; + CamerabinResourcePolicy::ResourceSet resourceSet = CamerabinResourcePolicy::NoResources; switch (state) { case QCamera::UnloadedState: resourceSet = CamerabinResourcePolicy::NoResources; diff --git a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp index 71f2d517..11b04a97 100644 --- a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp @@ -162,6 +162,8 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe m_resource->release(); } } +#else + Q_UNUSED(oldSet); #endif } diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp index 5dbfa3e4..cd326581 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -415,6 +415,7 @@ void QPulseAudioOutput::userFeed() } qint64 bytesWritten = write(m_audioBuffer, audioBytesPulled); Q_ASSERT(bytesWritten == audioBytesPulled); //unfinished write should not happen since the data provided is less than writableSize + Q_UNUSED(bytesWritten); if (chunks > 1) { // PulseAudio needs more data. Ask for it immediately. From ab54cc46c6eb52163ea1735cc252815172be3a6a Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sun, 31 Mar 2013 20:45:31 +0800 Subject: [PATCH 4/5] Doc: Fix minor typos Task-number: QTWEBSITE-514 Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae Reviewed-by: Jerome Pasion --- src/imports/audioengine/qdeclarative_soundinstance_p.cpp | 2 +- src/imports/multimedia/Video.qml | 4 ++-- src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm | 2 +- src/plugins/avfoundation/mediaplayer/avfvideooutput.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp index dc5e9e96..b1c5f3cc 100644 --- a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp +++ b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp @@ -442,7 +442,7 @@ void QDeclarativeSoundInstance::setVelocity(const QVector3D& velocity) /*! \qmlproperty vector3d QtAudioEngine1::SoundInstance::gain - This property holds the gain adjustment which will be used to modulate the audio ouput level + This property holds the gain adjustment which will be used to modulate the audio output level from this SoundInstance. */ qreal QDeclarativeSoundInstance::gain() const diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index c379c122..f65054cd 100644 --- a/src/imports/multimedia/Video.qml +++ b/src/imports/multimedia/Video.qml @@ -113,12 +113,12 @@ Item { \li VideoOutput.Stretch - the video is scaled to fit \li VideoOutput.PreserveAspectFit - the video is scaled uniformly to fit without cropping - \li VideoOuput.PreserveAspectCrop - the video is scaled uniformly to fill, cropping + \li VideoOutput.PreserveAspectCrop - the video is scaled uniformly to fill, cropping if necessary \endlist Because this type is for convenience in QML, it does not - support enumerations directly, so enumerations from \c VideoOuput are + support enumerations directly, so enumerations from \c VideoOutput are used to access the available fill modes. The default fill mode is preserveAspectFit. diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm index 54c65fdd..9a180849 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm @@ -447,7 +447,7 @@ void AVFMediaPlayerSession::setVideoOutput(AVFVideoOutput *output) if (m_videoOutput == output) return; - //Set the current ouput layer to null to stop rendering + //Set the current output layer to null to stop rendering if (m_videoOutput) { m_videoOutput->setLayer(0); } diff --git a/src/plugins/avfoundation/mediaplayer/avfvideooutput.h b/src/plugins/avfoundation/mediaplayer/avfvideooutput.h index 00302912..02091392 100644 --- a/src/plugins/avfoundation/mediaplayer/avfvideooutput.h +++ b/src/plugins/avfoundation/mediaplayer/avfvideooutput.h @@ -54,7 +54,7 @@ public: }; #define AVFVideoOutput_iid \ - "org.qt-project.qt.AVFVideoOuput/5.0" + "org.qt-project.qt.AVFVideoOutput/5.0" Q_DECLARE_INTERFACE(AVFVideoOutput, AVFVideoOutput_iid) QT_END_NAMESPACE From bf26ab71e0713bbcaa967402992630411086769c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 6 Apr 2013 13:57:18 -0700 Subject: [PATCH 5/5] Fix warnings found by GCC 4.8 in qtmultimedia MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qgstreamermessage.cpp:48:12: warning: ‘wuchi’ defined but not used [-Wunused-variable] qvideosurfacegstsink.cpp:383:1: warning: narrowing conversion of ‘4278190080u’ from ‘unsigned int’ to ‘int’ inside { } [-Wnarrowing] Change-Id: I678e9eb39f3963e20109bb15c9c0c0d118b5a3b2 Reviewed-by: Christian Stromme --- src/gsttools/qgstreamermessage.cpp | 1 + src/gsttools/qvideosurfacegstsink.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gsttools/qgstreamermessage.cpp b/src/gsttools/qgstreamermessage.cpp index fd6bde9f..89ecf0b3 100644 --- a/src/gsttools/qgstreamermessage.cpp +++ b/src/gsttools/qgstreamermessage.cpp @@ -56,6 +56,7 @@ static int wuchi = qRegisterMetaType(); QGstreamerMessage::QGstreamerMessage(): m_message(0) { + Q_UNUSED(wuchi); } QGstreamerMessage::QGstreamerMessage(GstMessage* message): diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp index c41f8d76..94aa1262 100644 --- a/src/gsttools/qvideosurfacegstsink.cpp +++ b/src/gsttools/qvideosurfacegstsink.cpp @@ -371,12 +371,12 @@ struct RgbFormat static const RgbFormat qt_rgbColorLookup[] = { - { QVideoFrame::Format_RGB32 , 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x00000000 }, + { QVideoFrame::Format_RGB32 , 32, 24, 4321, 0x0000FF00, 0x00FF0000, int(0xFF000000), 0x00000000 }, { QVideoFrame::Format_RGB32 , 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 }, - { QVideoFrame::Format_BGR32 , 32, 24, 4321, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 }, + { QVideoFrame::Format_BGR32 , 32, 24, 4321, int(0xFF000000), 0x00FF0000, 0x0000FF00, 0x00000000 }, { QVideoFrame::Format_BGR32 , 32, 24, 1234, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 }, - { QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x000000FF }, - { QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000 }, + { QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, int(0xFF000000), 0x000000FF }, + { QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, int(0xFF000000) }, { QVideoFrame::Format_RGB24 , 24, 24, 4321, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 }, { QVideoFrame::Format_BGR24 , 24, 24, 4321, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 }, { QVideoFrame::Format_RGB565, 16, 16, 1234, 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }