Merge pull request #1356 from ElderOrb/master

notify player about self-pause in case of MediaEndAction_Pause triggering

Author: wang-bin

src/AVDemuxThread.cpp

@@ -674,6 +674,7 @@ void AVDemuxThread::run()
                     break;
                 pause(true);
                 Q_EMIT requestClockPause(true);
+                Q_EMIT mediaEndActionPauseTriggered();
                 if (aqueue)
                     aqueue->blockEmpty(true);
                 if (vqueue)

src/AVDemuxThread.h

@@ -64,6 +64,7 @@ class AVDemuxThread : public QThread
     bool hasSeekTasks();
 Q_SIGNALS:
     void requestClockPause(bool value);
+    void mediaEndActionPauseTriggered();
     void mediaStatusChanged(QtAV::MediaStatus);
     void bufferProgressChanged(qreal);
     void seekFinished(qint64 timestamp);

src/AVPlayer.cpp

@@ -91,6 +91,7 @@ AVPlayer::AVPlayer(QObject *parent) :
     //direct connection can not sure slot order?
     connect(d->read_thread, SIGNAL(finished()), this, SLOT(stopFromDemuxerThread()), Qt::DirectConnection);
     connect(d->read_thread, SIGNAL(requestClockPause(bool)), masterClock(), SLOT(pause(bool)), Qt::DirectConnection);
+    connect(d->read_thread, SIGNAL(mediaEndActionPauseTriggered()), this, SLOT(onMediaEndActionPauseTriggered()));
     connect(d->read_thread, SIGNAL(mediaStatusChanged(QtAV::MediaStatus)), this, SLOT(updateMediaStatus(QtAV::MediaStatus)));
     connect(d->read_thread, SIGNAL(bufferProgressChanged(qreal)), this, SIGNAL(bufferProgressChanged(qreal)));
     connect(d->read_thread, SIGNAL(seekFinished(qint64)), this, SLOT(onSeekFinished(qint64)), Qt::DirectConnection);
@@ -1404,6 +1405,16 @@ void AVPlayer::updateMediaStatus(QtAV::MediaStatus status)
     Q_EMIT mediaStatusChanged(d->status);
 }
 
+void AVPlayer::onMediaEndActionPauseTriggered()
+{
+    if(d->state == PausedState)
+        return;
+
+    d->state = PausedState;
+    Q_EMIT stateChanged(d->state);
+    Q_EMIT paused(true);
+}
+
 void AVPlayer::onSeekFinished(qint64 value)
 {
     d->seeking = false;

src/QtAV/AVPlayer.h

@@ -616,6 +616,7 @@ private Q_SLOTS:
     void stopNotifyTimer();
     void onStarted();
     void updateMediaStatus(QtAV::MediaStatus status);
+    void onMediaEndActionPauseTriggered();
     void onSeekFinished(qint64 value);
     void onStepFinished();
     void tryClearVideoRenderers();