qml: add MediaPlayer.startPosition/stopPosition

hwd8868 · May 29, 2016 · 1b7167e · 1b7167e
1 parent 77833f4
commit 1b7167e
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 2 deletions.
diff --git a/qml/QmlAV/QmlAVPlayer.h b/qml/QmlAV/QmlAVPlayer.h
@@ -64,6 +64,9 @@ class QmlAVPlayer : public QObject, public QQmlParserStatus
     Q_ENUMS(Error)
     Q_ENUMS(ChannelLayout)
     // not supported by QtMultimedia
+    Q_ENUMS(PositionValue)
+    Q_PROPERTY(int startPosition READ startPosition WRITE setStartPosition NOTIFY startPositionChanged)
+    Q_PROPERTY(int stopPosition READ stopPosition WRITE setStopPosition NOTIFY stopPositionChanged)
     Q_PROPERTY(bool fastSeek READ isFastSeek WRITE setFastSeek NOTIFY fastSeekChanged)
     Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged)
     Q_PROPERTY(bool abortOnTimeout READ abortOnTimeout WRITE setAbortOnTimeout NOTIFY abortOnTimeoutChanged)
@@ -88,6 +91,7 @@ class QmlAVPlayer : public QObject, public QQmlParserStatus
     Q_PROPERTY(QStringList supportedAudioBackends READ supportedAudioBackends)
 public:
     enum Loop { Infinite = -1 };
+    enum PositionValue { PositionMax = (1<<31)-1};
     enum PlaybackState {
         StoppedState,
         PlayingState,
@@ -133,7 +137,7 @@ class QmlAVPlayer : public QObject, public QQmlParserStatus
     QUrl source() const;
     void setSource(const QUrl& url);
 
-    // 0,1: play once. Loop.Infinite: forever.
+    // 0,1: play once. MediaPlayer.Infinite: forever.
     // >1: play loopCount() - 1 times. different from Qt
     int loopCount() const;
     void setLoopCount(int c);
@@ -147,6 +151,15 @@ class QmlAVPlayer : public QObject, public QQmlParserStatus
     int duration() const;
     int position() const;
     bool isSeekable() const;
+
+    int startPosition() const;
+    void setStartPosition(int value);
+    int stopPosition() const;
+    /*!
+     * \brief setStopPosition
+     * You can use MediaPlayer.PositionMax to play until the end of stream.
+     */
+    void setStopPosition(int value);
     bool isFastSeek() const;
     void setFastSeek(bool value);
 
@@ -249,6 +262,8 @@ public Q_SLOTS:
     void paused();
     void stopped();
     void playing();
+    void startPositionChanged();
+    void stopPositionChanged();
     void seekableChanged();
     void seekFinished(); //WARNING: position() now is not the seek finished video timestamp
     void fastSeekChanged();
@@ -304,6 +319,7 @@ private Q_SLOTS:
     bool m_fastSeek;
     bool m_loading;
     int mLoopCount;
+    int mStart, mStop;
     qreal mPlaybackRate;
     qreal mVolume;
     PlaybackState mPlaybackState;

diff --git a/qml/QmlAVPlayer.cpp b/qml/QmlAVPlayer.cpp
@@ -52,6 +52,8 @@ QmlAVPlayer::QmlAVPlayer(QObject *parent) :
   , m_fastSeek(false)
   , m_loading(false)
   , mLoopCount(1)
+  , mStart(0)
+  , mStop(PositionMax)
   , mPlaybackRate(1.0)
   , mVolume(1.0)
   , mPlaybackState(StoppedState)
@@ -565,6 +567,41 @@ bool QmlAVPlayer::isSeekable() const
     return mpPlayer && mpPlayer->isSeekable();
 }
 
+int QmlAVPlayer::startPosition() const
+{
+    return mStart;
+}
+
+void QmlAVPlayer::setStartPosition(int value)
+{
+    if (mStart == value)
+        return;
+    mStart = value;
+    Q_EMIT startPositionChanged();
+    if (mpPlayer) {
+        mpPlayer->setStartPosition(mStart);
+    }
+}
+
+int QmlAVPlayer::stopPosition() const
+{
+    return mStop;
+}
+
+void QmlAVPlayer::setStopPosition(int value)
+{
+    if (mStop == value)
+        return;
+    mStop = value;
+    Q_EMIT stopPositionChanged();
+    if (mpPlayer) {
+        if (value == PositionMax)
+            mpPlayer->setStopPosition();
+        else
+            mpPlayer->setStopPosition(value);
+    }
+}
+
 bool QmlAVPlayer::isFastSeek() const
 {
     return m_fastSeek;
@@ -632,6 +669,12 @@ void QmlAVPlayer::setPlaybackState(PlaybackState playbackState)
                 if (!vcopt.isEmpty())
                     mpPlayer->setOptionsForVideoCodec(vcopt);
             }
+            mpPlayer->setStartPosition(startPosition());
+            if (stopPosition() == PositionMax)
+                mpPlayer->setStopPosition();
+            else
+                mpPlayer->setStopPosition(stopPosition());
+
             m_loading = true;
             mpPlayer->stop();
             // change backends is not thread safe now, so change when stopped

diff --git a/qml/Video.qml b/qml/Video.qml
@@ -17,7 +17,7 @@ import QtAV 1.7
 
     \qml
     import QtQuick 2.0
-    import QtAV 1.3
+    import QtAV 1.7
 
     Video {
         id: video
@@ -62,6 +62,8 @@ import QtAV 1.7
 Item {
     id: video
 
+    property alias startPosition: player.startPosition
+    property alias stopPosition: player.stopPosition
     property alias videoFiltersGPU: videoOut.filters
     property alias audioFilters: player.audioFilters
     property alias videoFilters: player.videoFilters

diff --git a/qml/plugins.qmltypes b/qml/plugins.qmltypes
@@ -148,6 +148,12 @@ Module {
                 "Infinite": -1
             }
         }
+        Enum {
+            name: "PositionValue"
+            values: {
+                "PositionMax": 2147483647
+            }
+        }
         Enum {
             name: "PlaybackState"
             values: {
@@ -210,6 +216,8 @@ Module {
         Property { name: "metaData"; type: "MediaMetaData"; isReadonly: true; isPointer: true }
         Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true }
         Property { name: "errorString"; type: "string"; isReadonly: true }
+        Property { name: "startPosition"; type: "int" }
+        Property { name: "stopPosition"; type: "int" }
         Property { name: "fastSeek"; type: "bool" }
         Property { name: "timeout"; type: "int" }
         Property { name: "abortOnTimeout"; type: "bool" }