From 7f286e0965eb31f29c68b1c1e32d2653ae34014e Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Fri, 18 Mar 2016 14:07:42 +0100 Subject: Remove the traces of the discontinued android-no-sdk platform Change-Id: Ib9ba913543270e25e9c8deff492b98b0525c9219 Reviewed-by: Christian Stromme --- src/plugins/android/android.pro | 2 +- src/plugins/android/src/qandroidmediaserviceplugin.cpp | 2 -- src/plugins/opensles/qopenslesengine.cpp | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro index fa322942b..e77053b77 100644 --- a/src/plugins/android/android.pro +++ b/src/plugins/android/android.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS += src -android:!android-no-sdk: SUBDIRS += jar +android: SUBDIRS += jar qtHaveModule(quick) { SUBDIRS += videonode diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp index 693789054..87de7d561 100644 --- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp +++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp @@ -148,7 +148,6 @@ int QAndroidMediaServicePlugin::cameraOrientation(const QByteArray &device) cons QT_END_NAMESPACE -#ifndef Q_OS_ANDROID_NO_SDK Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { QT_USE_NAMESPACE @@ -176,4 +175,3 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) return JNI_VERSION_1_4; } -#endif // Q_OS_ANDROID_NO_SDK diff --git a/src/plugins/opensles/qopenslesengine.cpp b/src/plugins/opensles/qopenslesengine.cpp index 8a08c46f3..0cbd10887 100644 --- a/src/plugins/opensles/qopenslesengine.cpp +++ b/src/plugins/opensles/qopenslesengine.cpp @@ -143,7 +143,7 @@ QList QOpenSLESEngine::supportedSampleRates(QAudio::Mode mode) const int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defaultValue) { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) static int sampleRate = 0; static int framesPerBuffer = 0; static const int sdkVersion = QtAndroidPrivate::androidSdkVersion(); @@ -204,7 +204,7 @@ int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defau int QOpenSLESEngine::getDefaultBufferSize(const QAudioFormat &format) { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) if (!format.isValid()) return 0; @@ -252,7 +252,7 @@ int QOpenSLESEngine::getLowLatencyBufferSize(const QAudioFormat &format) bool QOpenSLESEngine::supportsLowLatency() { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) static int isSupported = -1; if (isSupported != -1) -- cgit v1.2.1 From fb9a67438b9454db262a8522d43fad98c7359961 Mon Sep 17 00:00:00 2001 From: Milla Pohjanheimo Date: Tue, 19 Apr 2016 11:21:14 +0300 Subject: Blacklist qtmultimedia autotests that have been failing since RHEL 6.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Blacklisted tests in RHEL 7.2: pullSuspendResume() from tst_qaudiooutput, playPauseStop() from tst_qmediaplayerbackend and testLooping() from tst_qsoundeffect Task-number: QTBUG-52673 Task-number: QTBUG-46368 Task-number: QTBUG-46689 Change-Id: If43763e5d6083492a79bb555a165c35217237201 Reviewed-by: Tony Sarajärvi --- tests/auto/integration/qaudiooutput/BLACKLIST | 2 ++ tests/auto/integration/qmediaplayerbackend/BLACKLIST | 1 + tests/auto/integration/qsoundeffect/BLACKLIST | 1 + 3 files changed, 4 insertions(+) diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST index 4d45efe06..b8a98c374 100644 --- a/tests/auto/integration/qaudiooutput/BLACKLIST +++ b/tests/auto/integration/qaudiooutput/BLACKLIST @@ -1,5 +1,7 @@ +#QTBUG-52673 [pullSuspendResume] redhatenterpriselinuxworkstation-6.6 rhel-7.1 ubuntu-14.04 opensuse-13.1 64bit +rhel-7.2 diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index b55c167ac..7ce72c7ac 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -24,6 +24,7 @@ redhatenterpriselinuxworkstation-6.6 rhel-7.1 ubuntu-14.04 64bit windows 64bit developer-build +rhel-7.2 [processEOS] opensuse-13.1 64bit diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST index 1feeb4b5f..3a358789a 100644 --- a/tests/auto/integration/qsoundeffect/BLACKLIST +++ b/tests/auto/integration/qsoundeffect/BLACKLIST @@ -5,3 +5,4 @@ ubuntu-14.04 64bit redhatenterpriselinuxworkstation-6.6 rhel-7.1 opensuse-13.1 +rhel-7.2 -- cgit v1.2.1 From c85fd6df07935b9c0fa08f881271cd94ad100003 Mon Sep 17 00:00:00 2001 From: Christian Stromme Date: Tue, 19 Apr 2016 00:31:51 +0200 Subject: Fix unused variable warning Caused by a Q_D macro in QMediaNetworkPlaylistProvider::moveMedia(). - warning: unused variable 'd' [-Wunused-variable] Change-Id: I43518366153ddabc7a8401ee112abec78640b992 Reviewed-by: Yoann Lopes --- src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index 5e2efbb99..a2c448da1 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -206,8 +206,6 @@ bool QMediaNetworkPlaylistProvider::insertMedia(int pos, const QList Date: Mon, 25 Apr 2016 12:16:30 +0300 Subject: tst_qaudioinput blacklist pushSuspendResume on RHEL 7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To get RHEL 7.2 in the CI, we need to blacklist this failing test Task-number: QTBUG-49736 Change-Id: I4c2c587770a214230c9116d2984ad327f22388a7 Reviewed-by: Tony Sarajärvi --- tests/auto/integration/qaudioinput/BLACKLIST | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 tests/auto/integration/qaudioinput/BLACKLIST diff --git a/tests/auto/integration/qaudioinput/BLACKLIST b/tests/auto/integration/qaudioinput/BLACKLIST new file mode 100644 index 000000000..3f0b96c57 --- /dev/null +++ b/tests/auto/integration/qaudioinput/BLACKLIST @@ -0,0 +1,4 @@ +#QTBUG-49736 +[pushSuspendResume] +rhel-7.2 + -- cgit v1.2.1 From 97be9eb9b13c65f0ef6a6bf4f043fc865365089f Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 21 Apr 2016 15:11:49 +0200 Subject: Add missing implementation for QMediaPlaylist::moveMedia(). QMediaNetworkPlaylistProvider, which is the default playlist provider, didn't have an implementation for that new function added in 5.7. Change-Id: I1ec8cdd60a1429addd47d0b37131f724e8d4b748 Reviewed-by: Christian Stromme --- src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index a2c448da1..67ce123d8 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -206,10 +206,16 @@ bool QMediaNetworkPlaylistProvider::insertMedia(int pos, const QList= 0 && from < mediaCount()); + Q_ASSERT(to >= 0 && to < mediaCount()); + + if (from == to) + return false; + + const QMediaContent media = d->resources.at(from); + return removeMedia(from, from) && insertMedia(to, media); } bool QMediaNetworkPlaylistProvider::removeMedia(int fromPos, int toPos) -- cgit v1.2.1 From ade1028a62e5727c0505ab557099ff09de3fe375 Mon Sep 17 00:00:00 2001 From: Milla Pohjanheimo Date: Wed, 27 Apr 2016 07:12:57 +0300 Subject: Blacklist tst_qaudioinput and tst_qaudiooutput tests from OpenSUSE 42.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed the 'insignificant_test' config and instead blacklisting just the failing test QAudioInput::pushSuspendResume on those platforms where it fails. Also blacklisting QAudioOutput::pullSuspendResume from OpenSUSE 42.1 Task-number: QTBUG-49736 Task-number: QTBUG-52673 Change-Id: I14a32db371680d9b2d6112c13ca353622d98f380 Reviewed-by: Tony Sarajärvi --- tests/auto/integration/qaudioinput/BLACKLIST | 5 ++++- tests/auto/integration/qaudioinput/qaudioinput.pro | 2 +- tests/auto/integration/qaudiooutput/BLACKLIST | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/auto/integration/qaudioinput/BLACKLIST b/tests/auto/integration/qaudioinput/BLACKLIST index 3f0b96c57..f6a8a670f 100644 --- a/tests/auto/integration/qaudioinput/BLACKLIST +++ b/tests/auto/integration/qaudioinput/BLACKLIST @@ -1,4 +1,7 @@ #QTBUG-49736 [pushSuspendResume] +redhatenterpriselinuxworkstation-6.6 rhel-7.2 - +ubuntu-14.04 +opensuse-13.1 +opensuse-42.1 diff --git a/tests/auto/integration/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro index 737ff6c23..31de98eb0 100644 --- a/tests/auto/integration/qaudioinput/qaudioinput.pro +++ b/tests/auto/integration/qaudioinput/qaudioinput.pro @@ -3,7 +3,7 @@ TARGET = tst_qaudioinput QT += core multimedia-private testlib # This is more of a system test -CONFIG += testcase insignificant_test +CONFIG += testcase HEADERS += wavheader.h SOURCES += wavheader.cpp tst_qaudioinput.cpp diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST index b8a98c374..e6cd7c846 100644 --- a/tests/auto/integration/qaudiooutput/BLACKLIST +++ b/tests/auto/integration/qaudiooutput/BLACKLIST @@ -4,4 +4,5 @@ redhatenterpriselinuxworkstation-6.6 rhel-7.1 ubuntu-14.04 opensuse-13.1 64bit +opensuse-42.1 rhel-7.2 -- cgit v1.2.1 From 5c4772b4647344bf31402323e3af11b5c8e4f29d Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 29 Apr 2016 13:07:14 +0200 Subject: Add missing \since tag for brightness property Change-Id: I804e5ea2bac65e48ddc32c8e60ea36e143b43fc0 Reviewed-by: Denis Shienkov Reviewed-by: Yoann Lopes --- src/imports/multimedia/qdeclarativecameraimageprocessing.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp index c7e4c703b..e8a816727 100644 --- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp +++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp @@ -148,6 +148,8 @@ void QDeclarativeCameraImageProcessing::setManualWhiteBalance(qreal colorTemp) c Image brightness adjustment. Valid brightness adjustment values range between -1.0 and 1.0, with a default of 0. + + \since 5.7 */ qreal QDeclarativeCameraImageProcessing::brightness() const { -- cgit v1.2.1 From e23176461b9b62939dbf2ad542780446fa8a8163 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 29 Apr 2016 12:57:58 +0200 Subject: Add new QDeclarativePlayList 5.7 items with new QML revision Change-Id: I1f332230e34e04a304cbe6d9b6d4a4dceb70095b Reviewed-by: Yoann Lopes --- src/imports/multimedia/multimedia.cpp | 3 +++ src/imports/multimedia/qdeclarativeplaylist_p.h | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 0ebe5cd0e..ae00e4413 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -135,6 +135,9 @@ public: qmlRegisterType(uri, 5, 6, "Playlist"); qmlRegisterType(uri, 5, 6, "PlaylistItem"); + // 5.7 types + qmlRegisterType(uri, 5, 7, "Playlist"); + qmlRegisterType(); qmlRegisterType(); } diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h index 50869e422..22c853605 100644 --- a/src/imports/multimedia/qdeclarativeplaylist_p.h +++ b/src/imports/multimedia/qdeclarativeplaylist_p.h @@ -158,12 +158,12 @@ public Q_SLOTS: void load(const QUrl &location, const QString &format = QString()); bool save(const QUrl &location, const QString &format = QString()); bool addItem(const QUrl &source); - bool addItems(const QList &sources); + Q_REVISION(1) bool addItems(const QList &sources); bool insertItem(int index, const QUrl &source); - bool insertItems(int index, const QList &sources); - bool moveItem(int from, int to); + Q_REVISION(1) bool insertItems(int index, const QList &sources); + Q_REVISION(1) bool moveItem(int from, int to); bool removeItem(int index); - bool removeItems(int start, int end); + Q_REVISION(1) bool removeItems(int start, int end); bool clear(); Q_SIGNALS: -- cgit v1.2.1 From f21e89e4ee6077e0ddcfeb6f4791cb4389f0ba5c Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 29 Apr 2016 13:04:39 +0200 Subject: Mark CameraImageProcessing's new brightness property with revision 2 It was added in Qt 5.7 and the QML version should be adjusted accordingly. Change-Id: I227a63c240edbe8880612076899dc3db47dc47d0 Reviewed-by: Yoann Lopes --- src/imports/multimedia/multimedia.cpp | 2 ++ src/imports/multimedia/qdeclarativecameraimageprocessing_p.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index ae00e4413..872b2ae61 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -137,6 +137,8 @@ public: // 5.7 types qmlRegisterType(uri, 5, 7, "Playlist"); + qmlRegisterUncreatableType(uri, 5, 7, "CameraImageProcessing", + trUtf8("CameraImageProcessing is provided by Camera")); qmlRegisterType(); qmlRegisterType(); diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h index bb10cdeba..eb755d87c 100644 --- a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h +++ b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h @@ -66,7 +66,7 @@ class QDeclarativeCameraImageProcessing : public QObject Q_PROPERTY(WhiteBalanceMode whiteBalanceMode READ whiteBalanceMode WRITE setWhiteBalanceMode NOTIFY whiteBalanceModeChanged) Q_PROPERTY(qreal manualWhiteBalance READ manualWhiteBalance WRITE setManualWhiteBalance NOTIFY manualWhiteBalanceChanged) - Q_PROPERTY(qreal brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged) + Q_PROPERTY(qreal brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged REVISION 2) Q_PROPERTY(qreal contrast READ contrast WRITE setContrast NOTIFY contrastChanged) Q_PROPERTY(qreal saturation READ saturation WRITE setSaturation NOTIFY saturationChanged) Q_PROPERTY(qreal sharpeningLevel READ sharpeningLevel WRITE setSharpeningLevel NOTIFY sharpeningLevelChanged) @@ -116,7 +116,7 @@ public Q_SLOTS: void setWhiteBalanceMode(QDeclarativeCameraImageProcessing::WhiteBalanceMode mode) const; void setManualWhiteBalance(qreal colorTemp) const; - void setBrightness(qreal value); + Q_REVISION(2) void setBrightness(qreal value); void setContrast(qreal value); void setSaturation(qreal value); void setSharpeningLevel(qreal value); @@ -128,7 +128,7 @@ Q_SIGNALS: void whiteBalanceModeChanged(QDeclarativeCameraImageProcessing::WhiteBalanceMode) const; void manualWhiteBalanceChanged(qreal) const; - void brightnessChanged(qreal); + Q_REVISION(2) void brightnessChanged(qreal); void contrastChanged(qreal); void saturationChanged(qreal); void sharpeningLevelChanged(qreal); -- cgit v1.2.1 From af250eadcb12b8d8e132e6a011e88a7b4e52a948 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 29 Apr 2016 11:34:53 +0200 Subject: Update qmltypes for Qt Multimedia Change-Id: I4093645a5120c4aa15253afd978fe7e13f4fe114 Reviewed-by: Yoann Lopes --- src/imports/multimedia/plugins.qmltypes | 47 ++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index fe1c68af2..40d0ee7e0 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -832,10 +832,11 @@ Module { prototype: "QObject" exports: [ "QtMultimedia/CameraImageProcessing 5.0", - "QtMultimedia/CameraImageProcessing 5.5" + "QtMultimedia/CameraImageProcessing 5.5", + "QtMultimedia/CameraImageProcessing 5.7" ] isCreatable: false - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 1] Enum { name: "WhiteBalanceMode" values: { @@ -868,6 +869,7 @@ Module { } Property { name: "whiteBalanceMode"; type: "WhiteBalanceMode" } Property { name: "manualWhiteBalance"; type: "double" } + Property { name: "brightness"; revision: 2; type: "double" } Property { name: "contrast"; type: "double" } Property { name: "saturation"; type: "double" } Property { name: "sharpeningLevel"; type: "double" } @@ -881,6 +883,11 @@ Module { name: "manualWhiteBalanceChanged" Parameter { type: "double" } } + Signal { + name: "brightnessChanged" + revision: 2 + Parameter { type: "double" } + } Signal { name: "contrastChanged" Parameter { type: "double" } @@ -905,6 +912,11 @@ Module { name: "setManualWhiteBalance" Parameter { name: "colorTemp"; type: "double" } } + Method { + name: "setBrightness" + revision: 2 + Parameter { name: "value"; type: "double" } + } Method { name: "setContrast" Parameter { name: "value"; type: "double" } @@ -1243,8 +1255,8 @@ Module { name: "QDeclarativePlaylist" defaultProperty: "items" prototype: "QAbstractListModel" - exports: ["QtMultimedia/Playlist 5.6"] - exportMetaObjectRevisions: [0] + exports: ["QtMultimedia/Playlist 5.6", "QtMultimedia/Playlist 5.7"] + exportMetaObjectRevisions: [0, 1] Enum { name: "PlaybackMode" values: { @@ -1350,17 +1362,44 @@ Module { type: "bool" Parameter { name: "source"; type: "QUrl" } } + Method { + name: "addItems" + revision: 1 + type: "bool" + Parameter { name: "sources"; type: "QList" } + } Method { name: "insertItem" type: "bool" Parameter { name: "index"; type: "int" } Parameter { name: "source"; type: "QUrl" } } + Method { + name: "insertItems" + revision: 1 + type: "bool" + Parameter { name: "index"; type: "int" } + Parameter { name: "sources"; type: "QList" } + } + Method { + name: "moveItem" + revision: 1 + type: "bool" + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + } Method { name: "removeItem" type: "bool" Parameter { name: "index"; type: "int" } } + Method { + name: "removeItems" + revision: 1 + type: "bool" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } Method { name: "clear"; type: "bool" } } Component { -- cgit v1.2.1 From 25d8db4dca34e276cd020fad2487e4af4eda997d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 3 May 2016 10:45:27 +0200 Subject: DirectShow: Improve error handling. Retrieve COM error via struct _com_error and output a qWarning() whenever a QMediaPlayer::ResourceError occurs. Task-number: QTBUG-53114 Change-Id: I3eceafeade60dd35e6c570499cef6093b49d737d Reviewed-by: Yoann Lopes --- .../directshow/player/directshowplayerservice.cpp | 39 ++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 7c2cd8a9a..05ea3e68f 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -72,8 +72,22 @@ #include #include +#ifndef Q_CC_MINGW +# include +#endif + Q_GLOBAL_STATIC(DirectShowEventLoop, qt_directShowEventLoop) +static QString comError(HRESULT hr) +{ +#ifndef Q_CC_MINGW // MinGW 5.3 no longer has swprintf_s(). + _com_error error(hr); + return QString::fromWCharArray(error.ErrorMessage()); +#else + Q_UNUSED(hr) + return QString(); +#endif +} // QMediaPlayer uses millisecond time units, direct show uses 100 nanosecond units. static const int qt_directShowTimeScale = 10000; @@ -368,17 +382,11 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker) m_error = QMediaPlayer::FormatError; m_errorString = QString(); break; - case E_FAIL: - case E_OUTOFMEMORY: - case VFW_E_CANNOT_LOAD_SOURCE_FILTER: - case VFW_E_NOT_FOUND: - m_error = QMediaPlayer::ResourceError; - m_errorString = QString(); - break; default: m_error = QMediaPlayer::ResourceError; m_errorString = QString(); - qWarning("DirectShowPlayerService::doSetUrlSource: Unresolved error code %x", uint(hr)); + qWarning("DirectShowPlayerService::doSetUrlSource: Unresolved error code 0x%x (%s)", + uint(hr), qPrintable(comError(hr))); break; } @@ -392,7 +400,8 @@ void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker) DirectShowIOSource *source = new DirectShowIOSource(m_loop); source->setDevice(m_stream); - if (SUCCEEDED(m_graph->AddFilter(source, L"Source"))) { + const HRESULT hr = m_graph->AddFilter(source, L"Source"); + if (SUCCEEDED(hr)) { m_executedTasks = SetSource; m_pendingTasks |= Render; @@ -413,6 +422,8 @@ void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker) m_error = QMediaPlayer::ResourceError; m_errorString = QString(); + qWarning("DirectShowPlayerService::doPlay: Unresolved error code 0x%x (%s)", + uint(hr), qPrintable(comError(hr))); QCoreApplication::postEvent(this, new QEvent(QEvent::Type(Error))); } @@ -528,8 +539,8 @@ void DirectShowPlayerService::doRender(QMutexLocker *locker) default: m_error = QMediaPlayer::ResourceError; m_errorString = QString(); - qWarning("DirectShowPlayerService::doRender: Unresolved error code %x", - uint(renderHr)); + qWarning("DirectShowPlayerService::doRender: Unresolved error code 0x%x (%s)", + uint(renderHr), qPrintable(comError(renderHr))); } } @@ -740,7 +751,8 @@ void DirectShowPlayerService::doPlay(QMutexLocker *locker) } else { m_error = QMediaPlayer::ResourceError; m_errorString = QString(); - qWarning("DirectShowPlayerService::doPlay: Unresolved error code %x", uint(hr)); + qWarning("DirectShowPlayerService::doPlay: Unresolved error code 0x%x (%s)", + uint(hr), qPrintable(comError(hr))); QCoreApplication::postEvent(this, new QEvent(QEvent::Type(Error))); } @@ -799,7 +811,8 @@ void DirectShowPlayerService::doPause(QMutexLocker *locker) } else { m_error = QMediaPlayer::ResourceError; m_errorString = QString(); - qWarning("DirectShowPlayerService::doPause: Unresolved error code %x", uint(hr)); + qWarning("DirectShowPlayerService::doPause: Unresolved error code 0x%x (%s)", + uint(hr), qPrintable(comError(hr))); QCoreApplication::postEvent(this, new QEvent(QEvent::Type(Error))); } -- cgit v1.2.1 From c82d2e9bdac621520365fe3dd0b09b00c90ce478 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 3 May 2016 11:26:47 +0200 Subject: Do not pin Multimedia QML module version The module always moves in sync with the Qt release version. Change-Id: Ib8800a450b7e4a76f73f953ec5fffd0dc829a400 Reviewed-by: Yoann Lopes --- src/imports/multimedia/multimedia.pro | 1 - src/imports/multimedia/plugins.qmltypes | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index dabb0a4ba..4c35784b9 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -1,7 +1,6 @@ CXX_MODULE = multimedia TARGET = declarative_multimedia TARGETPATH = QtMultimedia -IMPORT_VERSION = 5.6 QT += qml quick network multimedia-private qtmultimediaquicktools-private diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 40d0ee7e0..3163b0548 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtMultimedia 5.6' +// 'qmlplugindump -nonrelocatable QtMultimedia 5.7' Module { dependencies: ["QtQuick 2.0"] -- cgit v1.2.1 From 7f502f32d9cc08bca841962511bbfabab1334b43 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 3 May 2016 11:15:08 +0200 Subject: Update QML revisions for CameraImageProcessing CameraImageProcessing uses two revisions these days. Updating the qmltypes file was missed when bumping the revision in one of the last commits. Change-Id: Ibb49d26c33ff4eea453839fb0ae87c9f0a9ad5b1 Reviewed-by: Yoann Lopes --- src/imports/multimedia/plugins.qmltypes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 3163b0548..91fff02eb 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -836,7 +836,7 @@ Module { "QtMultimedia/CameraImageProcessing 5.7" ] isCreatable: false - exportMetaObjectRevisions: [0, 1, 1] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "WhiteBalanceMode" values: { -- cgit v1.2.1