Merge lp:~lorn-potter/qtubuntu-media/add-buffering_changed into lp:qtubuntu-media

[Lorn Potter]

Add media buffering signal handling

Add media buffering signal handling

[Jim Hodapp (jhodapp)]

Several comments inline below.

review: Needs Fixing (code)

[lp:~lorn-potter/qtubuntu-media/add-buffering_changed]

110. By Lorn Potter on 2016-06-08

code review fixups

111. By Lorn Potter on 2016-06-08

fix unit test for buffering change

112. By Lorn Potter on 2016-06-09

Use DirectConnection for buffering signal

[Jim Hodapp (jhodapp)]

Just a couple of fixes left.

review: Needs Fixing

[lp:~lorn-potter/qtubuntu-media/add-buffering_changed]

113. By Lorn Potter on 2016-06-12

change buffering test player to static const review

[Jim Hodapp (jhodapp)]

LGTM!

review: Approve (code)

[lp:~lorn-potter/qtubuntu-media/add-buffering_changed]

114. By Lorn Potter on 2016-06-15

bump media-hub version requirements

115. By Lorn Potter on 2016-06-29

bump version requirements for media-hub

116. By Lorn Potter on 2016-07-06

media-hub requirements for 4.3.0

117. By Lorn Potter on 2016-07-07

bump media-hub required version

118. By Lorn Potter on 2016-07-11

drop specific build version from media-hub dependency

=== modified file 'debian/control'
--- debian/control	2016-05-19 19:02:00 +0000
+++ debian/control	2016-07-11 01:04:24 +0000
@@ -9,7 +9,7 @@
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
                libhybris-dev (>= 0.1.0+git20131207+e452e83-0ubuntu13),
-               libmedia-hub-dev (>= 4.2.0),
+               libmedia-hub-dev (>= 4.4.0),
                libpulse-dev,
                libqt5opengl5-dev,
                libqtubuntu-media-signals-dev (>= 0.3+15.04.20150618.1-0ubuntu1),

=== modified file 'src/aal/aalmediaplayercontrol.cpp'
--- src/aal/aalmediaplayercontrol.cpp	2016-02-26 21:27:01 +0000
+++ src/aal/aalmediaplayercontrol.cpp	2016-07-11 01:04:24 +0000
@@ -146,8 +146,7 @@
 
 int AalMediaPlayerControl::bufferStatus() const
 {
-    // Until we are playing network streams, there is no buffering necessary
-    return 100;
+    return m_service->bufferStatus();
 }
 
 bool AalMediaPlayerControl::isAudioAvailable() const

=== modified file 'src/aal/aalmediaplayerservice.cpp'
--- src/aal/aalmediaplayerservice.cpp	2016-05-02 14:10:04 +0000
+++ src/aal/aalmediaplayerservice.cpp	2016-07-11 01:04:24 +0000
@@ -70,6 +70,7 @@
      m_playbackStatusChangedConnection(the_void.connect([](){})),
      m_errorConnection(the_void.connect([](){})),
      m_endOfStreamConnection(the_void.connect([](){})),
+     m_bufferingStatusChangedConnection(the_void.connect([](){})),
      m_mediaPlayerControl(nullptr),
      m_videoOutput(nullptr),
      m_mediaPlaylistControl(nullptr),
@@ -79,6 +80,7 @@
      m_firstPlayback(true),
      m_cachedDuration(0),
      m_mediaPlaylist(NULL),
+     m_bufferPercent(0),
      m_doReattachSession(false)
 #ifdef MEASURE_PERFORMANCE
       , m_lastFrameDecodeStart(0)
@@ -102,6 +104,7 @@
       m_playbackStatusChangedConnection(the_void.connect([](){})),
       m_errorConnection(the_void.connect([](){})),
       m_endOfStreamConnection(the_void.connect([](){})),
+      m_bufferingStatusChangedConnection(the_void.connect([](){})),
       m_mediaPlayerControl(nullptr),
       m_videoOutput(nullptr),
       m_mediaPlaylistControl(nullptr),
@@ -111,6 +114,7 @@
       m_firstPlayback(true),
       m_cachedDuration(0),
       m_mediaPlaylist(NULL),
+      m_bufferPercent(0),
       m_doReattachSession(false)
   #ifdef MEASURE_PERFORMANCE
        , m_lastFrameDecodeStart(0)
@@ -176,6 +180,12 @@
             QMetaObject::invokeMethod(this, "onPlaybackStatusChanged", Qt::QueuedConnection);
         });
 
+    m_bufferingStatusChangedConnection = m_hubPlayerSession->buffering_changed().connect(
+                [this](int bufferingPercent) {
+                    m_bufferPercent = bufferingPercent;
+                    QMetaObject::invokeMethod(this, "onBufferingChanged", Qt::DirectConnection);
+                });
+
     m_errorConnection = m_hubPlayerSession->error().connect(
             std::bind(&AalMediaPlayerService::onError, this, _1));
 }
@@ -772,6 +782,11 @@
     }
 }
 
+void AalMediaPlayerService::onBufferingChanged()
+{
+    Q_EMIT m_mediaPlayerControl->bufferStatusChanged(m_bufferPercent);
+}
+
 void AalMediaPlayerService::updateClientSignals()
 {
     qDebug() << Q_FUNC_INFO;

=== modified file 'src/aal/aalmediaplayerservice.h'
--- src/aal/aalmediaplayerservice.h	2016-03-28 15:54:06 +0000
+++ src/aal/aalmediaplayerservice.h	2016-07-11 01:04:24 +0000
@@ -103,6 +103,8 @@
      * service object */
     void setService(const std::shared_ptr<core::ubuntu::media::Service> &service);
 
+    int bufferStatus() { return m_bufferPercent; }
+
 Q_SIGNALS:
     void serviceReady();
     void playbackComplete();
@@ -111,6 +113,7 @@
 public Q_SLOTS:
     void onPlaybackStatusChanged();
     void onApplicationStateChanged(Qt::ApplicationState state);
+    void onBufferingChanged();
 
 protected:
     void constructNewPlayerService();
@@ -145,6 +148,7 @@
     core::Connection m_playbackStatusChangedConnection;
     core::Connection m_errorConnection;
     core::Connection m_endOfStreamConnection;
+    core::Connection m_bufferingStatusChangedConnection;
 
     AalMediaPlayerControl *m_mediaPlayerControl;
     AalVideoRendererControl *m_videoOutput;
@@ -159,6 +163,7 @@
     const QMediaPlaylist* m_mediaPlaylist;
 
     core::ubuntu::media::Player::PlaybackStatus m_newStatus;
+    int m_bufferPercent;
 
     std::string m_sessionUuid;
     bool m_doReattachSession;

=== modified file 'tests/unit/player.cpp'
--- tests/unit/player.cpp	2016-03-17 19:44:54 +0000
+++ tests/unit/player.cpp	2016-07-11 01:04:24 +0000
@@ -311,6 +311,12 @@
     return ret;
 }
 
+const core::Signal<int>& TestPlayer::buffering_changed() const
+{
+    static const core::Signal<int> dur;
+    return dur;
+}
+
 const std::shared_ptr<Service> Service::Client::instance()
 {
     return NULL;

=== modified file 'tests/unit/player.h'
--- tests/unit/player.h	2016-03-17 19:44:54 +0000
+++ tests/unit/player.h	2016-07-11 01:04:24 +0000
@@ -96,6 +96,7 @@
     virtual const core::Signal<video::Dimensions>& video_dimension_changed() const;
     /** Signals all errors and warnings (typically from GStreamer and below) */
     virtual const core::Signal<Error>& error() const;
+    virtual const core::Signal<int>& buffering_changed() const;
 
 private:
     core::Property<int64_t> m_position;

=== modified file 'tests/unit/player_mock.cpp'
--- tests/unit/player_mock.cpp	2015-06-08 19:16:35 +0000
+++ tests/unit/player_mock.cpp	2016-07-11 01:04:24 +0000
@@ -308,6 +308,12 @@
     return ret;
 }
 
+const core::Signal<int>& PlayerMock::buffering_changed() const
+{
+    static const core::Signal<int> dur;
+    return dur;
+}
+
 }
 }
 }

=== modified file 'tests/unit/player_mock.h'
--- tests/unit/player_mock.h	2015-06-08 19:16:35 +0000
+++ tests/unit/player_mock.h	2016-07-11 01:04:24 +0000
@@ -92,6 +92,7 @@
     virtual const core::Signal<core::ubuntu::media::video::Dimensions>& video_dimension_changed() const;
     virtual const core::Signal<uint64_t>& duration_changed() const;
     virtual const core::Signal<Error>& error() const;
+    virtual const core::Signal<int>& buffering_changed() const;
 
 private:
     core::Property<int64_t> m_position;