diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-17 03:00:51 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-17 03:00:51 +0200 |
commit | a31d981b08519922b4c9c17b17122c02c1734ef4 (patch) | |
tree | bf2068df8fa1158aa1c1d7eef3cf17dd13cc363d /src/gsttools/qgstreamerplayercontrol.cpp | |
parent | f49bfa05d1f67327a33d2b66e9ff1bcc32ad8d05 (diff) | |
parent | 7b1bb300166aa19dc0f4c6838eb6d284af73236c (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I09f511d894db5e9987ac2b9e42266bb87ef0161d
Diffstat (limited to 'src/gsttools/qgstreamerplayercontrol.cpp')
-rw-r--r-- | src/gsttools/qgstreamerplayercontrol.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gsttools/qgstreamerplayercontrol.cpp b/src/gsttools/qgstreamerplayercontrol.cpp index 03350a432..5075b098a 100644 --- a/src/gsttools/qgstreamerplayercontrol.cpp +++ b/src/gsttools/qgstreamerplayercontrol.cpp @@ -225,6 +225,10 @@ void QGstreamerPlayerControl::pause() qDebug() << Q_FUNC_INFO; #endif m_userRequestedState = QMediaPlayer::PausedState; + // If the playback has not been started yet but pause is requested. + // Seek to the beginning to show first frame. + if (m_pendingSeekPosition == -1 && m_session->position() == 0) + m_pendingSeekPosition = 0; playOrPause(QMediaPlayer::PausedState); } @@ -354,7 +358,7 @@ void QGstreamerPlayerControl::setMedia(const QMediaContent &content, QIODevice * m_currentState = QMediaPlayer::StoppedState; QMediaContent oldMedia = m_currentResource; - m_pendingSeekPosition = 0; + m_pendingSeekPosition = -1; m_session->showPrerollFrames(false); // do not show prerolled frames until pause() or play() explicitly called m_setMediaPending = false; |