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

[Jim Hodapp]

Add a signal that sets the desired video orientation and height/width, for use in qtvideo-node

Add a signal that sets the desired video orientation and height/width, for use in qtvideo-node

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-utopic-i386-ci/1

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

=== modified file 'src/qtubuntu_media_signals.cpp'
--- src/qtubuntu_media_signals.cpp	2013-03-08 20:12:31 +0000
+++ src/qtubuntu_media_signals.cpp	2014-10-13 19:36:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -24,6 +24,7 @@
 SharedSignal::SharedSignal(QObject *parent)
     : QObject(parent)
 {
+    qRegisterMetaType<SharedSignal::Orientation>("SharedSignal::Orientation");
 }
 
 SharedSignal* SharedSignal::instance()

=== modified file 'src/qtubuntu_media_signals.h'
--- src/qtubuntu_media_signals.h	2014-03-17 15:34:29 +0000
+++ src/qtubuntu_media_signals.h	2014-10-13 19:36:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -28,6 +28,18 @@
 {
     Q_OBJECT
 public:
+
+    /** This needs to stay in sync with the same definition in media-hub
+     *  include/core/media/player.h
+     */
+    enum Orientation
+    {
+        rotate0,
+        rotate90,
+        rotate180,
+        rotate270
+    };
+
     static SharedSignal* instance();
 
 Q_SIGNALS:
@@ -39,6 +51,13 @@
      * has been successfully passed to it and set.
      */
     void glConsumerSet();
+    /** Thrown by AalMediaPlayerService to indicate to qtvideo-node
+     * which rotation transformation matrix needs to be applied to
+     * each video frame for rendering.
+     * @param orientaiton rotate0, rotate90, rotate180, rotate270
+     * @param size width/height of a video frame
+     */
+    void setOrientation(const SharedSignal::Orientation& orientation, const QSize &size);
     /** Thrown by AalVideoRendererControl to signal set the snapshot size.
      */
     void setSnapshotSize(const QSize &size);