workaround: emit positionChanged after stepForward

aquarius20th · Feb 3, 2016 · d08961b · d08961b
1 parent f672d2d
commit d08961b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/AVDemuxThread.cpp b/src/AVDemuxThread.cpp
@@ -187,10  187,6 @@ void AVDemuxThread::stepBackward()
     };
 
     pause(true);
-    // set clock first
-    if (clock_type < 0)
-        clock_type = (int)video_thread->clock()->isClockAuto()   2*(int)video_thread->clock()->clockType();
-    video_thread->clock()->setClockType(AVClock::VideoClock);
     t->packetQueue()->clear(); // will put new packets before task run
     t->packetQueue();
     Packet pkt;
@@ -431,11  427,6 @@ void AVDemuxThread::seekOnPauseFinished()
         if (audio_thread)
             audio_thread->pause(true);
     }
-    if (clock_type >= 0) {
-        thread->clock()->setClockAuto(clock_type & 1);
-        thread->clock()->setClockType(AVClock::ClockType(clock_type/2));
-        clock_type = -1;
-    }
 }
 
 void AVDemuxThread::frameDeliveredOnStepForward()
@@ -460,6  451,7 @@ void AVDemuxThread::frameDeliveredOnStepForward()
         thread->clock()->setClockType(AVClock::ClockType(clock_type/2));
         clock_type = -1;
     }
     Q_EMIT stepFinished();
 }
 
 void AVDemuxThread::eofDecodedOnStepForward()
@@ -477,6  469,7 @@ void AVDemuxThread::eofDecodedOnStepForward()
         thread->clock()->setClockType(AVClock::ClockType(clock_type/2));
         clock_type = -1;
     }
     Q_EMIT stepFinished();
 }
 
 void AVDemuxThread::onAVThreadQuit()

diff --git a/src/AVDemuxThread.h b/src/AVDemuxThread.h
@@ -63,6  63,7 @@ class AVDemuxThread : public QThread
     void mediaStatusChanged(QtAV::MediaStatus);
     void bufferProgressChanged(qreal);
     void seekFinished(qint64 timestamp);
     void stepFinished();
     void internalSubtitlePacketRead(int index, const QtAV::Packet& packet);
 private slots:
     void seekOnPauseFinished();

diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
@@ -931,6  931,7 @@ qreal AVPlayer::positionF() const
 
 qint64 AVPlayer::position() const
 {
     // TODO: videoTime()?
     const qint64 pts = d->clock->value()*1000.0;
     if (relativeTimeMode())
         return pts - absoluteMediaStartPosition();
@@ -1443,7  1444,10 @@ void AVPlayer::onSeekFinished(qint64 value)
     d->seeking = false;
     Q_EMIT seekFinished(value);
     //d->clock->updateValue(value/1000.0);
-    Q_EMIT positionChanged(value);
     if (relativeTimeMode())
         Q_EMIT positionChanged(value - absoluteMediaStartPosition());
     else
         Q_EMIT positionChanged(value);
 }
 
 void AVPlayer::tryClearVideoRenderers()
@@ -1513,7  1517,7 @@ void AVPlayer::timerEvent(QTimerEvent *te)
     if (te->timerId() == d->timer_id) {
         // killTimer() should be in the same thread as object. kill here?
         if (isPaused()) {
-            return;
             //return; //ensure positionChanged emitted for stepForward()
         }
         // active only when playing
         const qint64 t = position();