summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-12-08 13:58:26 +0100
committerLiang Qi <liang.qi@qt.io>2017-12-08 13:58:26 +0100
commitc0931a0709748f2483aeea17555d6953b6f28417 (patch)
tree0de7ead5aec5a27ccf71a09a56eeb08e66a3f054
parent0e7fb980e37e73748c7bdb0dbf17950c8afafc79 (diff)
parent3598915a360c596da48c9e7b00ba8469cba5249a (diff)
downloadqtmultimedia-c0931a0709748f2483aeea17555d6953b6f28417.tar.gz
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: Iffeb04c00f5b9e7a51320570ea47e84d80fae844
-rw-r--r--dist/changes-5.10.041
-rw-r--r--dist/changes-5.9.358
-rw-r--r--src/multimedia/doc/qtmultimedia.qdocconf3
-rw-r--r--src/plugins/android/src/common/qandroidvideooutput.cpp1
-rw-r--r--src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp2
5 files changed, 103 insertions, 2 deletions
diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0
new file mode 100644
index 000000000..cbdb75b09
--- /dev/null
+++ b/dist/changes-5.10.0
@@ -0,0 +1,41 @@
+Qt 5.10 introduces many new features and improvements as well as bugfixes
+over the 5.9.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.10.0 Changes *
+****************************************************************************
+
+ - [QTBUG-57045] Fixed crash when calling pause in the onPositionChanged
+ handler.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+QNX
+---
+ - Added support for setting audio roles.
+
+Linux
+-----
+ - [QTBUG-62621] Unsupported audio formats in PulseAudio will now be rejected
+ instead of being played incorrectly.
+ - [QTBUG-63427] QSoundEffect with PulseAudio now supports 24 bit samples.
+
+Windows
+-------
+ - Added support for QMediaMetaData::Orientation.
diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3
new file mode 100644
index 000000000..568224232
--- /dev/null
+++ b/dist/changes-5.9.3
@@ -0,0 +1,58 @@
+Qt 5.9.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.9.3 Changes *
+****************************************************************************
+
+QtMultimedia
+------------
+
+- [QTBUG-53268] Fixed regression that caused relevant properties of the surface
+ format to be discarded when the video node was created.
+- [QTBUG-62255] Fixed loading of remote m3u files.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+Linux
+-----
+
+- [QTBUG-62789] Fixed memory leak in QGstreamerAudioDecoderSession.
+- [QTBUG-62245] Fixed input query in V4L code to correctly detect all cameras.
+- Fixed memory leak in CameraBinImageCapture.
+
+QNX
+---
+
+- Switched to mmr_event_t based metadata retrieval, as PPS based retrieval is no
+ longer supported by Multimedia for QNX 7.0.0.
+
+
+Android
+-------
+
+- [QTBUG-51213] The scan line for the video surface format is now correctly
+ set to bottom-up.
+
+WinRT
+-----
+
+- [QTBUG-63308] Added permission check for the camera.
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index e3d3827c5..074fcb75e 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -43,6 +43,9 @@ qhp.QtMultimedia.subprojects.examples.sortPages = true
exampledirs += ../../../examples \
snippets
+manifestmeta.highlighted.names = "QtMultimedia/QML Video Shader Effects Example" \
+ "QtMultimedia/Media Player Example"
+
headerdirs += ../..
imagedirs += src/images \
diff --git a/src/plugins/android/src/common/qandroidvideooutput.cpp b/src/plugins/android/src/common/qandroidvideooutput.cpp
index eb41d4a8e..b425b9d89 100644
--- a/src/plugins/android/src/common/qandroidvideooutput.cpp
+++ b/src/plugins/android/src/common/qandroidvideooutput.cpp
@@ -324,7 +324,6 @@ void QAndroidTextureVideoOutput::onFrameAvailable()
if (!m_surface->isActive()) {
QVideoSurfaceFormat format(frame.size(), frame.pixelFormat(),
QAbstractVideoBuffer::GLTextureHandle);
- format.setScanLineDirection(QVideoSurfaceFormat::BottomToTop);
m_surface->start(format);
}
diff --git a/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp b/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp
index e1a46841d..53345dec8 100644
--- a/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp
+++ b/src/plugins/wasapi/qwasapiaudiodeviceinfo.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcMmDeviceInfo, "qt.multimedia.deviceinfo")
QWasapiAudioDeviceInfo::QWasapiAudioDeviceInfo(QByteArray dev, QAudio::Mode mode)
- : m_deviceName(dev)
+ : m_deviceName(QString::fromLocal8Bit(dev))
{
qCDebug(lcMmDeviceInfo) << __FUNCTION__ << dev << mode;
m_interface = QWasapiUtils::createOrGetInterface(dev, mode);