summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mira <samuel.mira@qt.io>2021-12-13 17:37:32 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-14 11:55:22 +0000
commit0bf85e8a1781991c72d976467b1ef6bca14a7fab (patch)
tree32f3a1f70f5a03368419d014eaa57061ee045abd
parent5cd5708d07353f21b5e66cd941d62d7abbabfb68 (diff)
downloadqtmultimedia-0bf85e8a1781991c72d976467b1ef6bca14a7fab.tar.gz
Fix qmediaplayerbackend loadMediaInLoadingState test in Android
This particular test expected for a media status of loading after a setSource. On Android that only happened on the first time that a source was set. That was changed to properly change to state to a loadingMedia when the data source will be changed. Fixes: QTBUG-99181 Change-Id: Ic0e1d9e9517edffd9b59d098c9ff70df0673c9c1 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 33e1b6d61d2af3247e224d1cd08f6f0e051f99d9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp
index 5f19b0e02..85610e453 100644
--- a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp
@@ -322,6 +322,7 @@ void QAndroidMediaPlayer::setMedia(const QUrl &mediaContent,
mMediaPlayer->setDisplay(mVideoOutput->surfaceTexture());
mMediaPlayer->setDataSource(QNetworkRequest(mediaContent));
mMediaPlayer->prepareAsync();
+ setMediaStatus(QMediaPlayer::LoadingMedia);
}
resetBufferingProgress();