Resolve URL using QML context when setting QMediaPlayer source

This patch overrides MediaPlayer set source behavior by extending
QMediaPlayer with QQuickMediaPlayer. The URL set on the QML MediaPlayer
source is resovled with QQmlContext resolver before it is passed on to
QMediaPlayer.

Fixes: QTBUG-96985
Change-Id: Icead41a6780bc42c64c143837cd39215db27af5e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit e34b665f948e3a40af0dc43e4f2d4b383ddc5a0b)
Reviewed-by: Doris Verria <doris.verria@qt.io>

3 files changed, 93 insertions, 7 deletions

diff --git a/src/multimediaquick/CMakeLists.txt b/src/multimediaquick/CMakeLists.txt
index 2786be59e..c3d95dd0c 100644
--- a/src/multimediaquick/CMakeLists.txt
+++ b/src/multimediaquick/CMakeLists.txt
@@ -21,6 +21,7 @@ qt_internal_add_qml_module(MultimediaQuickPrivate
         qquickimagecapture.cpp qquickimagecapture_p.h
         qquickimagepreviewprovider.cpp qquickimagepreviewprovider_p.h
 #        qquickplaylist.cpp qquickplaylist_p.h
+        qquickmediaplayer_p.h
         qquickvideooutput.cpp qquickvideooutput_p.h
         qsgvideonode_p.cpp qsgvideonode_p.h
         qsgvideotexture.cpp qsgvideotexture_p.h
diff --git a/src/multimediaquick/qquickmediaplayer_p.h b/src/multimediaquick/qquickmediaplayer_p.h
new file mode 100644
index 000000000..4af74cf01
--- /dev/null
+++ b/src/multimediaquick/qquickmediaplayer_p.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKMEDIAPLAYER_H
+#define QQUICKMEDIAPLAYER_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QMediaPlayer>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcontext.h>
+#include <private/qtmultimediaquickglobal_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_MULTIMEDIAQUICK_EXPORT QQuickMediaPlayer : public QMediaPlayer
+{
+    Q_OBJECT
+    Q_PROPERTY(QUrl source READ qmlSource WRITE qmlSetSource NOTIFY sourceChanged)
+    QML_NAMED_ELEMENT(MediaPlayer)
+
+public:
+    QQuickMediaPlayer(QObject *parent = nullptr) : QMediaPlayer(parent) {}
+
+    void qmlSetSource(const QUrl &source)
+    {
+        if (m_source == source)
+            return;
+
+        m_source = source;
+        const QQmlContext *context = qmlContext(this);
+        setSource(context ? context->resolvedUrl(source) : source);
+        emit sourceChanged(source);
+    }
+
+    QUrl qmlSource() const { return m_source; }
+
+Q_SIGNALS:
+    void sourceChanged(const QUrl &source);
+
+private:
+    QUrl m_source;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/multimediaquick/qtmultimediaquicktypes_p.h b/src/multimediaquick/qtmultimediaquicktypes_p.h
index d202efd1f..c9bb47bee 100644
--- a/src/multimediaquick/qtmultimediaquicktypes_p.h
+++ b/src/multimediaquick/qtmultimediaquicktypes_p.h
@@ -64,13 +64,6 @@ struct QSoundEffectForeign
     QML_NAMED_ELEMENT(SoundEffect)
 };
 
-struct QMediaPlayerForeign
-{
-    Q_GADGET
-    QML_FOREIGN(QMediaPlayer)
-    QML_NAMED_ELEMENT(MediaPlayer)
-};
-
 struct QMediaCaptureSessionForeign
 {
     Q_GADGET