diff options
| author | Samuel Mira <samuel.mira@qt.io> | 2021-12-13 17:19:33 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-14 11:55:23 +0000 |
| commit | 7f1265ee22a38341f8dbea9f0876d46053f3f44d (patch) | |
| tree | 608e1b0f30bfaa665d8752926d6062ea08f53fd1 | |
| parent | 4a5a7d2b3ad96bfbaf4e08d4e3e2ca2434e1b466 (diff) | |
| download | qtmultimedia-7f1265ee22a38341f8dbea9f0876d46053f3f44d.tar.gz | |
Fix qmediaplayerbackend unloadMedia test in Android
After changing the source to a empty url, the test expected the player
to return <= 0 seconds of duration, and the android media player was
returning the previous duration.
Fixes: QTBUG-99182
Change-Id: Iab1a8b386ed0d90d8621fb67528d5a44a2fa2c0c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 345134f517ddb3570cea41089ba2b2429c7eceb3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp index 9f8dfb629..693096a27 100644 --- a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp +++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp @@ -109,6 +109,9 @@ QAndroidMediaPlayer::~QAndroidMediaPlayer() qint64 QAndroidMediaPlayer::duration() const { + if (mediaStatus() == QMediaPlayer::NoMedia) + return 0; + if ((mState & (AndroidMediaPlayer::Prepared | AndroidMediaPlayer::Started | AndroidMediaPlayer::Paused |