Merge lp:~jhodapp/qtubuntu-media/orientation into lp:qtubuntu-media

[Jim Hodapp]

* Add simple support for Orientation Property changed signal that comes from media-hub
* Pass the video frame dimension in from media-hub through to qtvideo-node

* Add simple support for Orientation Property changed signal that comes from media-hub
* Pass the video frame dimension in from media-hub through to qtvideo-node

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jhodapp/qtubuntu-media/orientation]

48. By Jim Hodapp on 2014-10-15

Don't try to access the AalMediaPlayerService instance too early in the setup of AalVideoRendererControl.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/59/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jhodapp/qtubuntu-media/orientation]

49. By Jim Hodapp on 2014-10-15

Make sure we listen to the orientation signal in the right place.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/62/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/62/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jhodapp/qtubuntu-media/orientation]

50. By Jim Hodapp on 2014-10-16

If video playback needs 90 degree rotation, flip the height and width values.

51. By Jim Hodapp on 2014-10-16

Merged with upstream

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/63/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/63/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/64/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/64/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jhodapp/qtubuntu-media/orientation]

52. By Jim Hodapp on 2014-10-16

Merged with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/65/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

[lp:~jhodapp/qtubuntu-media/orientation]

53. By Jim Hodapp on 2014-10-20

Add 180 and 270 degree rotation/flipping of video playback.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/66/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/66/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/aal/aalmediaplayerservice.cpp'
--- src/aal/aalmediaplayerservice.cpp	2014-10-15 10:24:08 +0000
+++ src/aal/aalmediaplayerservice.cpp	2014-10-20 21:25:32 +0000
@@ -27,6 +27,8 @@
 
 #include <QThread>
 
+#include <qtubuntu_media_signals.h>
+
 // Defined in aalvideorenderercontrol.h
 #ifdef MEASURE_PERFORMANCE
 #include <QDateTime>

=== modified file 'src/aal/aalmediaplayerservice.h'
--- src/aal/aalmediaplayerservice.h	2014-10-15 09:26:40 +0000
+++ src/aal/aalmediaplayerservice.h	2014-10-20 21:25:32 +0000
@@ -83,6 +83,8 @@
 
     void pushPlaylist();
 
+    const std::shared_ptr<core::ubuntu::media::Player>& getPlayer() const { return m_hubPlayerSession; }
+
     /* This is for unittest purposes to be able to set a mock-object version of a
      * player object */
     void setPlayer(const std::shared_ptr<core::ubuntu::media::Player> &player);

=== modified file 'src/aal/aalvideorenderercontrol.cpp'
--- src/aal/aalvideorenderercontrol.cpp	2014-09-19 13:45:31 +0000
+++ src/aal/aalvideorenderercontrol.cpp	2014-10-20 21:25:32 +0000
@@ -38,6 +38,9 @@
 
 #include <qgl.h>
 
+namespace media = core::ubuntu::media;
+using namespace std::placeholders;
+
 class AalGLTextureBuffer : public QAbstractVideoBuffer
 {
 public:
@@ -80,8 +83,11 @@
      m_service(service),
      m_textureBuffer(0),
      m_textureId(0),
-     m_height(720),
-     m_width(1280),
+     m_orientation(media::Player::Orientation::rotate0),
+     m_height(0),
+     m_width(0),
+     m_surfaceStarted(false),
+     m_flipped(false),
      m_firstFrame(true),
      m_secondFrame(false)
 #ifdef MEASURE_PERFORMANCE
@@ -125,20 +131,55 @@
     return m_textureId;
 }
 
+uint32_t AalVideoRendererControl::height() const
+{
+    return m_height;
+}
+
+uint32_t AalVideoRendererControl::width() const
+{
+    return m_width;
+}
+
 void AalVideoRendererControl::setupSurface()
 {
     qDebug() << Q_FUNC_INFO;
 
+    m_service->getPlayer()->video_dimension_changed().connect(
+            std::bind(&AalVideoRendererControl::onVideoDimensionChanged, this, _1));
+
+    // When orientation changes during playback, cache a copy here
+    m_service->getPlayer()->orientation().changed().connect([this](const media::Player::Orientation &orientation)
+    {
+        m_orientation = orientation;
+    });
+
     if (!m_textureBuffer)
         m_textureBuffer = new AalGLTextureBuffer(m_textureId);
 
     updateVideoTexture();
 }
 
-void AalVideoRendererControl::setVideoSize(int height, int width)
+void AalVideoRendererControl::onVideoDimensionChanged(uint64_t mask)
 {
-    m_height = height;
-    m_width = width;
+    qDebug() << Q_FUNC_INFO;
+    const uint32_t width = static_cast<uint32_t>(mask & 0xFFFF);
+    const uint32_t height = static_cast<uint32_t>(mask >> 32);
+
+    // Make sure that X & Y remain flipped between multiple playbacks in the
+    // same session
+    if ((m_orientation == media::Player::Orientation::rotate90 ||
+         m_orientation == media::Player::Orientation::rotate270) && !m_flipped) {
+        m_height = width;
+        m_width = height;
+        m_flipped = true;
+    } else {
+        m_height = height;
+        m_width = width;
+    }
+
+    QSize frameSize(m_width, m_height);
+    Q_EMIT SharedSignal::instance()->setOrientation(static_cast<SharedSignal::Orientation>(m_orientation), frameSize);
 }
 
 void AalVideoRendererControl::updateVideoTexture()
@@ -211,11 +252,19 @@
     Q_UNUSED(empty);
     Q_ASSERT(m_surface != NULL);
 
-    if (!m_surface->isActive()) {
-        QVideoSurfaceFormat format(frame.size(), frame.pixelFormat(), frame.handleType());
+    // Wait until we have a height and width to start m_surface
+    if (!m_surface->isActive() || (m_height != 0 && m_width != 0)) {
+        if (!m_surfaceStarted) {
+            qDebug() << "Setting up surface with height: " << m_height << " width: " << m_width;
+            QVideoSurfaceFormat format(frame.size(), frame.pixelFormat(), frame.handleType());
 
-        if (!m_surface->start(format)) {
-            qWarning() << "Failed to start video surface with format:" << format;
+            if (!m_surface->start(format)) {
+                qWarning() << "Failed to start video surface with format:" << format;
+            }
+            // Make sure we don't create any more new QVideoSurfaceFormat instances
+            // after we have a proper height and width set
+            if (m_height != 0 && m_width != 0)
+                m_surfaceStarted = true;
         }
     }
 

=== modified file 'src/aal/aalvideorenderercontrol.h'
--- src/aal/aalvideorenderercontrol.h	2014-09-22 16:11:46 +0000
+++ src/aal/aalvideorenderercontrol.h	2014-10-20 21:25:32 +0000
@@ -17,6 +17,8 @@
 #ifndef AALVIDEORENDERERCONTROL_H
 #define AALVIDEORENDERERCONTROL_H
 
+#include <core/media/player.h>
+
 #include <QImage>
 #include <QVideoFrame>
 #include <QVideoRendererControl>
@@ -47,9 +49,11 @@
 
     GLuint textureId() const;
 
+    uint32_t height() const;
+    uint32_t width() const;
+
     // Callbacks
     static void updateVideoTextureCb(void *context);
-    static void setVideoSizeCb(int height, int width, void *data);
 
 public Q_SLOTS:
     void setupSurface();
@@ -58,13 +62,13 @@
     void surfaceChanged(QAbstractVideoSurface *surface);
 
 private Q_SLOTS:
-    void setVideoSize(int height, int width);
     void updateVideoTexture();
     void onTextureCreated(unsigned int textureID);
     void onServiceReady();
     void onGLConsumerSet();
 
 private:
+    void onVideoDimensionChanged(uint64_t mask);
     void presentVideoFrame(const QVideoFrame &frame, bool empty = false);
 
     QAbstractVideoSurface *m_surface;
@@ -72,8 +76,11 @@
     AalGLTextureBuffer *m_textureBuffer;
     GLuint m_textureId;
 
-    int m_height;
-    int m_width;
+    core::ubuntu::media::Player::Orientation m_orientation;
+    uint32_t m_height;
+    uint32_t m_width;
+    bool m_surfaceStarted;
+    bool m_flipped;
 
     bool m_firstFrame;
     bool m_secondFrame;

=== modified file 'unittests/player.cpp'
--- unittests/player.cpp	2014-09-26 18:06:11 +0000
+++ unittests/player.cpp	2014-10-20 21:25:32 +0000
@@ -153,6 +153,12 @@
     return ret;
 }
 
+const core::Property<TestPlayer::Orientation>& TestPlayer::orientation() const
+{
+    static core::Property<Player::Orientation> ret(Player::Orientation::rotate0);
+    return ret;
+}
+
 const core::Property<Player::LoopStatus>& TestPlayer::loop_status() const
 {
     static core::Property<Player::LoopStatus> ret(Player::LoopStatus::none);
@@ -266,6 +272,12 @@
     return ret;
 }
 
+const core::Signal<uint64_t>& TestPlayer::video_dimension_changed() const
+{
+    static core::Signal<uint64_t> ret;
+    return ret;
+}
+
 const std::shared_ptr<Service> Service::Client::instance()
 {
     return NULL;

=== modified file 'unittests/player.h'
--- unittests/player.h	2014-09-26 18:06:11 +0000
+++ unittests/player.h	2014-10-20 21:25:32 +0000
@@ -60,6 +60,7 @@
     virtual const core::Property<bool>& is_video_source() const;
     virtual const core::Property<bool>& is_audio_source() const;
     virtual const core::Property<PlaybackStatus>& playback_status() const;
+    virtual const core::Property<Orientation>& orientation() const;
     virtual const core::Property<LoopStatus>& loop_status() const;
     virtual const core::Property<PlaybackRate>& playback_rate() const;
     virtual const core::Property<bool>& is_shuffle() const;
@@ -81,6 +82,7 @@
     virtual const core::Signal<void>& end_of_stream() const;
     virtual const core::Signal<PlaybackStatus>& playback_status_changed() const;
     virtual core::Signal<PlaybackStatus>& playback_status_changed();
+    virtual const core::Signal<uint64_t>& video_dimension_changed() const;
 
 private:
     core::Property<int64_t> m_position;