diff options
Diffstat (limited to 'src/plugins/gstreamer')
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp | 7 | ||||
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp index 0bfe76f2f..ff17e37eb 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp @@ -308,7 +308,12 @@ void QGstreamerPlayerControl::stop() if (m_currentState != QMediaPlayer::StoppedState) { m_currentState = QMediaPlayer::StoppedState; m_session->showPrerollFrames(false); // stop showing prerolled frames in stop state - if (m_resources->isGranted()) + // Since gst is not going to send GST_STATE_PAUSED + // when pipeline is already paused, + // needs to update media status directly. + if (m_session->state() == QMediaPlayer::PausedState) + updateMediaStatus(); + else if (m_resources->isGranted()) m_session->pause(); if (m_mediaStatus != QMediaPlayer::EndOfMedia) { diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp index a96da66f8..d7cc5ed12 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -138,7 +138,7 @@ QGstreamerPlayerSession::QGstreamerPlayerSession(QObject *parent) m_videoAvailable(false), m_seekable(false), m_lastPosition(0), - m_duration(-1), + m_duration(0), m_durationQueries(0), m_displayPrerolledFrame(true), m_sourceType(UnknownSrc), @@ -294,7 +294,7 @@ void QGstreamerPlayerSession::loadFromStream(const QNetworkRequest &request, QIO qDebug() << Q_FUNC_INFO; #endif m_request = request; - m_duration = -1; + m_duration = 0; m_lastPosition = 0; if (!m_appSrc) @@ -323,7 +323,7 @@ void QGstreamerPlayerSession::loadFromUri(const QNetworkRequest &request) qDebug() << Q_FUNC_INFO << request.url(); #endif m_request = request; - m_duration = -1; + m_duration = 0; m_lastPosition = 0; #if QT_CONFIG(gstreamer_app) @@ -1455,7 +1455,7 @@ void QGstreamerPlayerSession::updateVideoResolutionTag() void QGstreamerPlayerSession::updateDuration() { gint64 gstDuration = 0; - int duration = -1; + int duration = 0; if (m_playbin && qt_gst_element_query_duration(m_playbin, GST_FORMAT_TIME, &gstDuration)) duration = gstDuration / 1000000; |