add bufferProgress property to player

Ivshti · Mar 19, 2015 · df3208c · df3208c
1 parent ce7b02b
commit df3208c
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 9 deletions.
diff --git a/examples/QMLPlayer/qml/QMLPlayer/main.qml b/examples/QMLPlayer/qml/QMLPlayer/main.qml
@@ -101,6  101,13 @@ Rectangle {
                 control.volume = value
             }
         }
         onStatusChanged: {
             if (status == MediaPlayer.LoadingMedia)
                 msg.info("Loading "   source)
         }
         onBufferProgressChanged: {
             msg.info("Buffering "   Math.floor(bufferProgress*100)   "%...")
         }
     }
     Subtitle {
         id: subtitle
@@ -203,7  210,7 @@ Rectangle {
                 player.play()
             }
         }
-        onVolumeChanged: player.volume = volume
         volume: player.volume
         onOpenFile: fileDialog.open()
         onShowInfo: pageLoader.source = "MediaInfoPage.qml"
         onShowHelp: pageLoader.source = "About.qml"

diff --git a/examples/player/MainWindow.cpp b/examples/player/MainWindow.cpp
@@ -166,6  166,7 @@ void MainWindow::initPlayer()
     connect(mpVolumeSlider, SIGNAL(valueChanged(int)), SLOT(setVolume()));
 
     connect(mpPlayer, SIGNAL(mediaStatusChanged(QtAV::MediaStatus)), SLOT(onMediaStatusChanged()));
     connect(mpPlayer, SIGNAL(bufferProgressChanged(qreal)), SLOT(onBufferProgress(qreal)));
     connect(mpPlayer, SIGNAL(error(QtAV::AVError)), this, SLOT(handleError(QtAV::AVError)));
     connect(mpPlayer, SIGNAL(started()), this, SLOT(onStartPlay()));
     connect(mpPlayer, SIGNAL(stopped()), this, SLOT(onStopPlay()));
@@ -1293,7  1294,12 @@ void MainWindow::onMediaStatusChanged()
         onStopPlay();
         break;
     }
-    setWindowTitle(status);
     setWindowTitle(status   " "   mTitle);
 }
 
 void MainWindow::onBufferProgress(qreal percent)
 {
     setWindowTitle(QString("Buffering... %1% ").arg(percent*100.0, 0, 'f', 1)   mTitle);
 }
 
 void MainWindow::onVideoEQEngineChanged()

diff --git a/examples/player/MainWindow.h b/examples/player/MainWindow.h
@@ -1,6  1,6 @@
 /******************************************************************************
     QtAV Player Demo:  this file is part of QtAV examples
-    Copyright (C) 2012-2014 Wang Bin <[email protected]>
     Copyright (C) 2012-2015 Wang Bin <[email protected]>
 
 *   This file is part of QtAV
 
@@ -111,6  111,7 @@ private slots:
     void onTimeSliderLeave();
     void handleError(const QtAV::AVError& e);
     void onMediaStatusChanged();
     void onBufferProgress(qreal percent);
 
     void onVideoEQEngineChanged();
     void onBrightnessChanged(int b);

diff --git a/qml/QmlAV/QmlAVPlayer.h b/qml/QmlAV/QmlAVPlayer.h
@@ -29,11  29,6 @@
 #include <QtAV/AVError.h>
 #include <QtAV/CommonTypes.h>
 
-/*!
- *  Qt.Multimedia like api
- * MISSING:
- * bufferProgress
- */
 namespace QtAV {
 class AVPlayer;
 }
@@ -56,6  51,7 @@ class QmlAVPlayer : public QObject, public QQmlParserStatus
     Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(int loops READ loopCount WRITE setLoopCount NOTIFY loopCountChanged)
     Q_PROPERTY(qreal bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
     Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
     Q_PROPERTY(MediaMetaData *metaData READ metaData CONSTANT)
     Q_PROPERTY(QObject *mediaObject READ mediaObject)
@@ -136,6  132,8 @@ class QmlAVPlayer : public QObject, public QQmlParserStatus
     bool isFastSeek() const;
     void setFastSeek(bool value);
 
     qreal bufferProgress() const;
 
     Status status() const;
     Error error() const;
     QString errorString() const;
@@ -198,6  196,7 @@ public Q_SLOTS:
     void playing();
     void seekableChanged();
     void fastSeekChanged();
     void bufferProgressChanged();
     void videoCodecPriorityChanged();
     void videoCodecOptionsChanged();
     void channelLayoutChanged();

diff --git a/qml/QmlAVPlayer.cpp b/qml/QmlAVPlayer.cpp
@@ -85,6  85,7 @@ void QmlAVPlayer::classBegin()
     connect(mpPlayer, SIGNAL(stopped()), SLOT(_q_stopped()));
     connect(mpPlayer, SIGNAL(positionChanged(qint64)), SIGNAL(positionChanged()));
     connect(mpPlayer, SIGNAL(seekableChanged()), SIGNAL(seekableChanged()));
     connect(mpPlayer, SIGNAL(bufferProgressChanged(qreal)), SIGNAL(bufferProgressChanged()));
     connect(this, SIGNAL(channelLayoutChanged()), SLOT(applyChannelLayout()));
 
     mVideoCodecs << "FFmpeg";
@@ -360,6  361,13 @@ void QmlAVPlayer::setFastSeek(bool value)
     emit fastSeekChanged();
 }
 
 qreal QmlAVPlayer::bufferProgress() const
 {
     if (!mpPlayer)
         return 0;
     return mpPlayer->bufferProgress();
 }
 
 QmlAVPlayer::Status QmlAVPlayer::status() const
 {
     return (Status)m_status;

diff --git a/qml/Video.qml b/qml/Video.qml
@@ -140,7  140,7 @@ Item {
         from 0.0 (empty) to 1.0
         (full).
     */
-    //property alias bufferProgress:  player.bufferProgress
     property alias bufferProgress:  player.bufferProgress
 
     /*!
         \qmlproperty int Video::duration

diff --git a/qml/plugins.qmltypes b/qml/plugins.qmltypes
@@ -189,6  189,7 @@ Module {
         Property { name: "playbackRate"; type: "double" }
         Property { name: "source"; type: "QUrl" }
         Property { name: "loops"; type: "int" }
         Property { name: "bufferProgress"; type: "double"; isReadonly: true }
         Property { name: "seekable"; type: "bool"; isReadonly: true }
         Property { name: "metaData"; type: "MediaMetaData"; isReadonly: true; isPointer: true }
         Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true }

diff --git a/src/AVDemuxThread.cpp b/src/AVDemuxThread.cpp
@@ -60,6  60,9 @@ AVDemuxThread::AVDemuxThread(QObject *parent) :
   , paused(false)
   , user_paused(false)
   , end(true)
   , m_buffering(false)
   , m_buffered(0)
   , m_buffer(0)
   , demuxer(0)
   , audio_thread(0)
   , video_thread(0)
@@ -74,6  77,9 @@ AVDemuxThread::AVDemuxThread(AVDemuxer *dmx, QObject *parent) :
     QThread(parent)
   , paused(false)
   , end(true)
   , m_buffering(false)
   , m_buffered(0)
   , m_buffer(0)
   , audio_thread(0)
   , video_thread(0)
 {
@@ -240,6  246,11 @@ bool AVDemuxThread::isEnd() const
     return end;
 }
 
 PacketBuffer* AVDemuxThread::buffer()
 {
     return m_buffer;
 }
 
 //No more data to put. So stop blocking the queue to take the reset elements
 void AVDemuxThread::stop()
 {
@@ -269,6  280,9 @@ void AVDemuxThread::stop()
     cond.wakeAll();
     qDebug("all avthread finished. try to exit demux thread<<<<<<");
     end = true;
     m_buffering = false;
     m_buffered = false;
     m_buffer = 0;
 }
 
 void AVDemuxThread::pause(bool p)
@@ -365,6  379,8 @@ void AVDemuxThread::frameDeliveredNextFrame()
 
 void AVDemuxThread::run()
 {
     m_buffering = false;
     m_buffered = false;
     end = false;
     if (audio_thread && !audio_thread->isRunning())
         audio_thread->start(QThread::HighPriority);
@@ -383,6  399,7 @@ void AVDemuxThread::run()
     qDebug("get av queue a/v thread = %p %p", audio_thread, video_thread);
     PacketBuffer *aqueue = audio_thread ? audio_thread->packetQueue() : 0;
     PacketBuffer *vqueue = video_thread ? video_thread->packetQueue() : 0;
     m_buffer = vqueue ? vqueue : aqueue;
     if (aqueue) {
         aqueue->clear();
         aqueue->setBlocking(true);
@@ -414,6  431,10 @@ void AVDemuxThread::run()
             qDebug("no running avthreads. exit demuxer thread");
             break;
         }
         if (m_buffering != m_buffer->isBuffering()) {
             m_buffering = m_buffer->isBuffering();
             Q_EMIT mediaStatusChanged(m_buffering ? QtAV::BufferingMedia : QtAV::BufferedMedia);
         }
         QMutexLocker locker(&buffer_mutex);
         Q_UNUSED(locker);
         if (!demuxer->readFrame()) {
@@ -460,6  481,12 @@ void AVDemuxThread::run()
         } else { //subtitle
             continue;
         }
         if (m_buffering) {
             if (m_buffered != m_buffer->buffered()) {
                 m_buffered = m_buffer->buffered();
                 Q_EMIT bufferProgressChanged(m_buffer->bufferProgress());
             }
         }
     }
     //flush. seeking will be omitted when stopped
     if (aqueue)

diff --git a/src/AVDemuxThread.h b/src/AVDemuxThread.h
@@ -48,13  48,17 @@ class AVDemuxThread : public QThread
     //AVDemuxer* demuxer
     bool isPaused() const;
     bool isEnd() const;
     PacketBuffer* buffer();
 
 public slots:
     void stop(); //TODO: remove it?
     void pause(bool p);
     void nextFrame(); // show next video frame and pause
 
 Q_SIGNALS:
     void requestClockPause(bool value);
     void mediaStatusChanged(QtAV::MediaStatus);
     void bufferProgressChanged(qreal);
 
 private slots:
     void frameDeliveredSeekOnPause();
@@ -79,6  83,9 @@ private slots:
     bool paused;
     bool user_paused;
     volatile bool end;
     bool m_buffering;
     int m_buffered;
     PacketBuffer *m_buffer;
     AVDemuxer *demuxer;
     AVThread *audio_thread, *video_thread;
     int audio_stream, video_stream;

diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
@@ -87,6  87,8 @@ AVPlayer::AVPlayer(QObject *parent) :
     //direct connection can not sure slot order?
     connect(d->read_thread, SIGNAL(finished()), this, SLOT(stopFromDemuxerThread()));
     connect(d->read_thread, SIGNAL(requestClockPause(bool)), masterClock(), SLOT(pause(bool)), Qt::DirectConnection);
     connect(d->read_thread, SIGNAL(mediaStatusChanged(QtAV::MediaStatus)), this, SIGNAL(mediaStatusChanged(QtAV::MediaStatus)));
     connect(d->read_thread, SIGNAL(bufferProgressChanged(qreal)), this, SIGNAL(bufferProgressChanged(qreal)));
 
     d->vcapture = new VideoCapture(this);
 }
@@ -1310,6  1312,12 @@ SeekType AVPlayer::seekType() const
     return d->seek_type;
 }
 
 qreal AVPlayer::bufferProgress() const
 {
     const PacketBuffer* buf = d->read_thread->buffer();
     return buf ? buf->bufferProgress() : 0;
 }
 
 void AVPlayer::updateClock(qint64 msecs)
 {
     d->clock->updateExternalClock(msecs);

diff --git a/src/QtAV/AVPlayer.h b/src/QtAV/AVPlayer.h
@@ -48,6  48,7 @@ class Q_AV_EXPORT AVPlayer : public QObject
     Q_PROPERTY(bool autoLoad READ isAutoLoad WRITE setAutoLoad NOTIFY autoLoadChanged)
     Q_PROPERTY(bool asyncLoad READ isAsyncLoad WRITE setAsyncLoad NOTIFY asyncLoadChanged)
     Q_PROPERTY(bool mute READ isMute WRITE setMute NOTIFY muteChanged)
     Q_PROPERTY(qreal bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
     Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
     Q_PROPERTY(qint64 position READ position WRITE setPosition NOTIFY positionChanged)
     Q_PROPERTY(qint64 startPosition READ startPosition WRITE setStartPosition NOTIFY startPositionChanged)
@@ -346,6  347,14 @@ public slots:
     void seekBackward();
     void setSeekType(SeekType type);
     SeekType seekType() const;
 
     /*!
      * \brief bufferProgress
      * How much the data buffer is currently filled. From 0.0 to 1.0.
      * Playback can start or resume only when the buffer is entirely filled.
      */
     qreal bufferProgress() const;
 
     /*!
      * \brief setNotifyInterval
      * The interval at which progress will update
@@ -362,6  371,7 @@ public slots:
     void setSaturation(int val);
 
 signals:
     void bufferProgressChanged(qreal);
     void relativeTimeModeChanged();
     void autoLoadChanged();
     void asyncLoadChanged();