Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

src/imports/multimedia/qdeclarativevideooutput_render.cpp

@@ -174,6 +174,12 @@ void QDeclarativeVideoRendererBackend::updateGeometry()
                                          totalHeight, totalWidth);
         }
     }
+
+    if (videoSurface()->surfaceFormat().scanLineDirection() == QVideoSurfaceFormat::BottomToTop) {
+        qreal top = m_sourceTextureRect.top();
+        m_sourceTextureRect.setTop(m_sourceTextureRect.bottom());
+        m_sourceTextureRect.setBottom(top);
+    }
 }
 
 QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode,

src/imports/multimedia/qsgvideonode_i420.cpp

@@ -194,25 +194,25 @@ QSGVideoMaterial_YUV420::QSGVideoMaterial_YUV420(const QVideoSurfaceFormat &form
     switch (format.yCbCrColorSpace()) {
     case QVideoSurfaceFormat::YCbCr_JPEG:
         m_colorMatrix = QMatrix4x4(
-                    1.0,  0.000,  1.402, -0.701,
+                    1.0f,  0.000f,  1.402f, -0.701f,
-                    1.0, -0.344, -0.714,  0.529,
+                    1.0f, -0.344f, -0.714f,  0.529f,
-                    1.0,  1.772,  0.000, -0.886,
+                    1.0f,  1.772f,  0.000f, -0.886f,
-                    0.0,  0.000,  0.000,  1.0000);
+                    0.0f,  0.000f,  0.000f,  1.0000f);
         break;
     case QVideoSurfaceFormat::YCbCr_BT709:
     case QVideoSurfaceFormat::YCbCr_xvYCC709:
         m_colorMatrix = QMatrix4x4(
-                    1.164,  0.000,  1.793, -0.5727,
+                    1.164f,  0.000f,  1.793f, -0.5727f,
-                    1.164, -0.534, -0.213,  0.3007,
+                    1.164f, -0.534f, -0.213f,  0.3007f,
-                    1.164,  2.115,  0.000, -1.1302,
+                    1.164f,  2.115f,  0.000f, -1.1302f,
-                    0.0,    0.000,  0.000,  1.0000);
+                    0.0f,    0.000f,  0.000f,  1.0000f);
         break;
     default: //BT 601:
         m_colorMatrix = QMatrix4x4(
-                    1.164,  0.000,  1.596, -0.8708,
+                    1.164f,  0.000f,  1.596f, -0.8708f,
-                    1.164, -0.392, -0.813,  0.5296,
+                    1.164f, -0.392f, -0.813f,  0.5296f,
-                    1.164,  2.017,  0.000, -1.081,
+                    1.164f,  2.017f,  0.000f, -1.081f,
-                    0.0,    0.000,  0.000,  1.0000);
+                    0.0f,    0.000f,  0.000f,  1.0000f);
     }
 
     setFlag(Blending, false);

src/multimedia/multimedia.pro

@@ -61,7 +61,8 @@ ANDROID_LIB_DEPENDENCIES = \
 ANDROID_BUNDLED_FILES += \
     lib/libQt5MultimediaQuick_p.so
 MODULE_PLUGIN_TYPES = \
-    mediaservice
+    mediaservice \
+    audio
 
 win32:LIBS += -luuid
 

src/multimedia/playback/playlistfileparser.cpp

@@ -176,6 +176,7 @@ private:
 
 class PLSParser : public ParserBase
 {
+    Q_OBJECT
 public:
     PLSParser(QObject *parent)
         : ParserBase(parent)
@@ -275,7 +276,7 @@ Version=2
                 int entries = getValue(lineIndex, line).toInt();
                 int count = m_readFlags == 0 ? (m_count - 1) : m_count;
                 if (entries != count) {
-                    emit error(QPlaylistFileParser::FormatError, QString(tr("Error parsing playlist: %1, expected count = %2")).
+                    emit error(QPlaylistFileParser::FormatError, tr("Error parsing playlist: %1, expected count = %2").
                                arg(line, QString::number(count)));
                 }
                 break;

src/multimediawidgets/qpaintervideosurface.cpp

@@ -466,25 +466,25 @@ void QVideoSurfaceGLPainter::updateColors(int brightness, int contrast, int hue,
         switch (m_colorSpace) {
         case QVideoSurfaceFormat::YCbCr_JPEG:
             colorSpaceMatrix = QMatrix4x4(
-                        1.0,  0.000,  1.402, -0.701,
+                        1.0f,  0.000f,  1.402f, -0.701f,
-                        1.0, -0.344, -0.714,  0.529,
+                        1.0f, -0.344f, -0.714f,  0.529f,
-                        1.0,  1.772,  0.000, -0.886,
+                        1.0f,  1.772f,  0.000f, -0.886f,
-                        0.0,  0.000,  0.000,  1.0000);
+                        0.0f,  0.000f,  0.000f,  1.0000f);
             break;
         case QVideoSurfaceFormat::YCbCr_BT709:
         case QVideoSurfaceFormat::YCbCr_xvYCC709:
             colorSpaceMatrix = QMatrix4x4(
-                        1.164,  0.000,  1.793, -0.5727,
+                        1.164f,  0.000f,  1.793f, -0.5727f,
-                        1.164, -0.534, -0.213,  0.3007,
+                        1.164f, -0.534f, -0.213f,  0.3007f,
-                        1.164,  2.115,  0.000, -1.1302,
+                        1.164f,  2.115f,  0.000f, -1.1302f,
-                        0.0,    0.000,  0.000,  1.0000);
+                        0.0f,    0.000f,  0.000f,  1.0000f);
             break;
         default: //BT 601:
             colorSpaceMatrix = QMatrix4x4(
-                        1.164,  0.000,  1.596, -0.8708,
+                        1.164f,  0.000f,  1.596f, -0.8708f,
-                        1.164, -0.392, -0.813,  0.5296,
+                        1.164f, -0.392f, -0.813f,  0.5296f,
-                        1.164,  2.017,  0.000, -1.081,
+                        1.164f,  2.017f,  0.000f, -1.081f,
-                        0.0,    0.000,  0.000,  1.0000);
+                        0.0f,    0.000f,  0.000f,  1.0000f);
         }
 
         m_colorMatrix = m_colorMatrix * colorSpaceMatrix;

src/plugins/android/src/android_mediaservice.json

@@ -1,3 +1,4 @@
 {
-    "Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource"]
+    "Keys": ["androidmultimedia"],
+    "Services": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource"]
 }