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

[Jim Hodapp]

* Add an Orientation property which will indicate how the video should be rotated for playback vs how it was recorded.
* Get the video frame height/width from mirsink and pass it to the media-hub client via a Signal.

* Add an Orientation property which will indicate how the video should be rotated for playback vs how it was recorded.
* Get the video frame height/width from mirsink and pass it to the media-hub client via a Signal.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/media-hub-ci/142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/83/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/82/console

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

review: Needs Fixing (continuous-integration)

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

71. By Jim Hodapp on 2014-10-15

Merged with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/media-hub-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/83

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

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

72. By Jim Hodapp on 2014-10-22

Only get the video dimensions and signal the client of the dimensions changing when playing a video.

Unmerged revisions

72. By Jim Hodapp on 2014-10-22

Only get the video dimensions and signal the client of the dimensions changing when playing a video.

=== modified file 'include/core/media/player.h'
--- include/core/media/player.h	2014-09-08 10:16:38 +0000
+++ include/core/media/player.h	2014-10-22 16:15:30 +0000
@@ -86,6 +86,14 @@
         phone
     };
 
+    enum Orientation
+    {
+        rotate0,
+        rotate90,
+        rotate180,
+        rotate270
+    };
+
     Player(const Player&) = delete;
     virtual ~Player();
 
@@ -127,6 +135,7 @@
     virtual const core::Property<int64_t>& position() const = 0;
     virtual const core::Property<int64_t>& duration() const = 0;
     virtual const core::Property<AudioStreamRole>& audio_stream_role() const = 0;
+    virtual const core::Property<Orientation>& orientation() const = 0;
 
     virtual core::Property<LoopStatus>& loop_status() = 0;
     virtual core::Property<PlaybackRate>& playback_rate() = 0;
@@ -137,6 +146,11 @@
     virtual const core::Signal<int64_t>& seeked_to() const = 0;
     virtual const core::Signal<void>& end_of_stream() const = 0;
     virtual core::Signal<PlaybackStatus>& playback_status_changed() = 0;
+    /**
+     * Called when the video height/width change. Passes height and width as a bitmask with
+     * height in the upper 32 bits and width in the lower 32 bits (both unsigned values)
+     */
+    virtual const core::Signal<uint64_t>& video_dimension_changed() const = 0;
   protected:
     Player();
 

=== modified file 'src/core/media/codec.h'
--- src/core/media/codec.h	2014-08-29 14:03:42 +0000
+++ src/core/media/codec.h	2014-10-22 16:15:30 +0000
@@ -190,6 +190,46 @@
     }
 };
 
+namespace helper
+{
+template<>
+struct TypeMapper<core::ubuntu::media::Player::Orientation>
+{
+    constexpr static ArgumentType type_value()
+    {
+        return core::dbus::ArgumentType::int16;
+    }
+    constexpr static bool is_basic_type()
+    {
+        return false;
+    }
+    constexpr static bool requires_signature()
+    {
+        return false;
+    }
+
+    static std::string signature()
+    {
+        static const std::string s = TypeMapper<std::int16_t>::signature();
+        return s;
+    }
+};
+}
+
+template<>
+struct Codec<core::ubuntu::media::Player::Orientation>
+{
+    static void encode_argument(core::dbus::Message::Writer& out, const core::ubuntu::media::Player::Orientation& in)
+    {
+        out.push_int16(static_cast<std::int16_t>(in));
+    }
+
+    static void decode_argument(core::dbus::Message::Reader& out, core::ubuntu::media::Player::Orientation& in)
+    {
+        in = static_cast<core::ubuntu::media::Player::Orientation>(out.pop_int16());
+    }
+};
+
 }
 }
 

=== modified file 'src/core/media/engine.h'
--- src/core/media/engine.h	2014-09-08 10:16:38 +0000
+++ src/core/media/engine.h	2014-10-22 16:15:30 +0000
@@ -95,6 +95,8 @@
     virtual const core::Property<core::ubuntu::media::Player::AudioStreamRole>& audio_stream_role() const = 0;
     virtual core::Property<core::ubuntu::media::Player::AudioStreamRole>& audio_stream_role() = 0;
 
+    virtual const core::Property<core::ubuntu::media::Player::Orientation>& orientation() const = 0;
+
     virtual const core::Property<std::tuple<Track::UriType, Track::MetaData>>& track_meta_data() const = 0;
 
     virtual const core::Signal<void>& about_to_finish_signal() const = 0;
@@ -102,6 +104,7 @@
     virtual const core::Signal<void>& client_disconnected_signal() const = 0;
     virtual const core::Signal<void>& end_of_stream_signal() const = 0;
     virtual const core::Signal<core::ubuntu::media::Player::PlaybackStatus>& playback_status_changed_signal() const = 0;
+    virtual const core::Signal<uint32_t, uint32_t>& video_dimension_changed_signal() const = 0;
 };
 }
 }

=== modified file 'src/core/media/gstreamer/bus.h'
--- src/core/media/gstreamer/bus.h	2014-07-21 23:14:55 +0000
+++ src/core/media/gstreamer/bus.h	2014-10-22 16:15:30 +0000
@@ -93,7 +93,7 @@
                             &detail.tag.tag_list);
                 cleanup = [this]()
                 {
-                    gst_tag_list_free(detail.tag.tag_list);
+                    gst_tag_list_unref(detail.tag.tag_list);
                 };
                 break;
             case GST_MESSAGE_BUFFERING:

=== modified file 'src/core/media/gstreamer/engine.cpp'
--- src/core/media/gstreamer/engine.cpp	2014-10-08 00:09:21 +0000
+++ src/core/media/gstreamer/engine.cpp	2014-10-22 16:15:30 +0000
@@ -72,6 +72,13 @@
         playbin.set_audio_stream_role(new_audio_role);
     }
 
+    void on_orientation_changed(const media::Player::Orientation& o)
+    {
+        // Update the local orientation Property, which should then update the Player
+        // orientation Property
+        orientation.set(o);
+    }
+
     void on_about_to_finish()
     {
         state = Engine::State::ready;
@@ -93,9 +100,15 @@
         end_of_stream();
     }
 
+    void on_video_dimension_changed(uint32_t height, uint32_t width)
+    {
+        video_dimension_changed(height, width);
+    }
+
     Private()
         : meta_data_extractor(new gstreamer::MetaDataExtractor()),
           volume(media::Engine::Volume(1.)),
+          orientation(media::Player::Orientation::rotate0),
           is_video_source(false),
           is_audio_source(false),
           about_to_finish_connection(
@@ -127,6 +140,12 @@
                       &Private::on_audio_stream_role_changed,
                       this,
                       std::placeholders::_1))),
+          on_orientation_changed_connection(
+              playbin.signals.on_orientation_changed.connect(
+                  std::bind(
+                      &Private::on_orientation_changed,
+                      this,
+                      std::placeholders::_1))),
           on_seeked_to_connection(
               playbin.signals.on_seeked_to.connect(
                   std::bind(
@@ -142,7 +161,14 @@
               playbin.signals.on_end_of_stream.connect(
                   std::bind(
                       &Private::on_end_of_stream,
-                      this)))
+                      this))),
+          on_video_dimension_changed_connection(
+              playbin.signals.on_add_frame_dimension.connect(
+                  std::bind(
+                      &Private::on_video_dimension_changed,
+                      this,
+                      std::placeholders::_1,
+                      std::placeholders::_2)))
     {
     }
 
@@ -157,6 +183,7 @@
     core::Property<uint64_t> duration;
     core::Property<media::Engine::Volume> volume;
     core::Property<media::Player::AudioStreamRole> audio_role;
+    core::Property<media::Player::Orientation> orientation;
     core::Property<bool> is_video_source;
     core::Property<bool> is_audio_source;
 
@@ -165,15 +192,18 @@
     core::ScopedConnection on_tag_available_connection;
     core::ScopedConnection on_volume_changed_connection;
     core::ScopedConnection on_audio_stream_role_changed_connection;
+    core::ScopedConnection on_orientation_changed_connection;
     core::ScopedConnection on_seeked_to_connection;
     core::ScopedConnection client_disconnected_connection;
     core::ScopedConnection on_end_of_stream_connection;
+    core::ScopedConnection on_video_dimension_changed_connection;
 
     core::Signal<void> about_to_finish;
     core::Signal<uint64_t> seeked_to;
     core::Signal<void> client_disconnected;
     core::Signal<void> end_of_stream;
     core::Signal<media::Player::PlaybackStatus> playback_status_changed;
+    core::Signal<uint32_t, uint32_t> video_dimension_changed;
 };
 
 gstreamer::Engine::Engine() : d(new Private{})
@@ -313,6 +343,11 @@
     return d->audio_role;
 }
 
+const core::Property<core::ubuntu::media::Player::Orientation>& gstreamer::Engine::orientation() const
+{
+    return d->orientation;
+}
+
 const core::Property<std::tuple<media::Track::UriType, media::Track::MetaData>>&
 gstreamer::Engine::track_meta_data() const
 {
@@ -343,3 +378,8 @@
 {
     return d->playback_status_changed;
 }
+
+const core::Signal<uint32_t, uint32_t>& gstreamer::Engine::video_dimension_changed_signal() const
+{
+    return d->video_dimension_changed;
+}

=== modified file 'src/core/media/gstreamer/engine.h'
--- src/core/media/gstreamer/engine.h	2014-08-29 14:03:42 +0000
+++ src/core/media/gstreamer/engine.h	2014-10-22 16:15:30 +0000
@@ -53,6 +53,8 @@
     const core::Property<core::ubuntu::media::Player::AudioStreamRole>& audio_stream_role() const;
     core::Property<core::ubuntu::media::Player::AudioStreamRole>& audio_stream_role();
 
+    const core::Property<core::ubuntu::media::Player::Orientation>& orientation() const;
+
     const core::Property<std::tuple<core::ubuntu::media::Track::UriType, core::ubuntu::media::Track::MetaData>>& track_meta_data() const;
 
     const core::Signal<void>& about_to_finish_signal() const;
@@ -60,6 +62,7 @@
     const core::Signal<void>& client_disconnected_signal() const;
     const core::Signal<void>& end_of_stream_signal() const;
     const core::Signal<core::ubuntu::media::Player::PlaybackStatus>& playback_status_changed_signal() const;
+    const core::Signal<uint32_t, uint32_t>& video_dimension_changed_signal() const;
 
 private:
     struct Private;

=== modified file 'src/core/media/gstreamer/meta_data_extractor.h'
--- src/core/media/gstreamer/meta_data_extractor.h	2014-08-26 20:34:30 +0000
+++ src/core/media/gstreamer/meta_data_extractor.h	2014-10-22 16:15:30 +0000
@@ -216,7 +216,7 @@
         }
 
         gst_object_unref (sinkpad);
-    }    
+    }
 
     GstElement* pipe;
     GstElement* decoder;

=== modified file 'src/core/media/gstreamer/playbin.h'
--- src/core/media/gstreamer/playbin.h	2014-10-10 16:03:24 +0000
+++ src/core/media/gstreamer/playbin.h	2014-10-22 16:15:30 +0000
@@ -31,6 +31,12 @@
 #include <chrono>
 #include <string>
 
+// Uncomment to generate a dot file at the time that the pipeline
+// goes to the PLAYING state. Make sure to export GST_DEBUG_DUMP_DOT_DIR
+// before starting media-hub-server. To convert the dot file to something
+// other image format, use: dot pipeline.dot -Tpng -o pipeline.png
+//#define DEBUG_GST_PIPELINE
+
 namespace media = core::ubuntu::media;
 
 namespace gstreamer
@@ -68,6 +74,9 @@
         : pipeline(gst_element_factory_make("playbin", pipeline_name().c_str())),
           bus{gst_element_get_bus(pipeline)},
           file_type(MEDIA_FILE_TYPE_NONE),
+          video_sink(nullptr),
+          video_height(0),
+          video_width(0),
           on_new_message_connection(
               bus.on_new_message.connect(
                   std::bind(
@@ -153,7 +162,17 @@
             signals.on_info(message.detail.error_warning_info);
             break;
         case GST_MESSAGE_TAG:
-            signals.on_tag_available(message.detail.tag);
+            {
+                gchar *orientation;
+                if (gst_tag_list_get_string(message.detail.tag.tag_list, "image-orientation", &orientation))
+                {
+                    // If the image-orientation tag is in the GstTagList, signal the Engine
+                    signals.on_orientation_changed(orientation_lut(orientation));
+                    g_free (orientation);
+                }
+
+                signals.on_tag_available(message.detail.tag);
+            }
             break;
         case GST_MESSAGE_STATE_CHANGED:
             signals.on_state_changed(message.detail.state_changed);
@@ -204,9 +223,9 @@
 
         if (::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME") != nullptr)
         {
-            auto video_sink = gst_element_factory_make (
-                    ::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME"),
-                    "video-sink");
+            video_sink = gst_element_factory_make (
+                ::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME"),
+                "video-sink");
 
             std::cout << "video_sink: " << ::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME") << std::endl;
 
@@ -224,7 +243,6 @@
 
         if (::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME") != nullptr)
         {
-            GstElement *video_sink = NULL;
             g_object_get (pipeline, "video_sink", &video_sink, NULL);
 
             // Get the service-side BufferQueue (IGraphicBufferProducer) and associate it with
@@ -265,6 +283,20 @@
         }
     }
 
+    media::Player::Orientation orientation_lut(const gchar *orientation)
+    {
+        if (g_strcmp0(orientation, "rotate-0") == 0)
+            return media::Player::Orientation::rotate0;
+        else if (g_strcmp0(orientation, "rotate-90") == 0)
+            return media::Player::Orientation::rotate90;
+        else if (g_strcmp0(orientation, "rotate-180") == 0)
+            return media::Player::Orientation::rotate180;
+        else if (g_strcmp0(orientation, "rotate-270") == 0)
+            return media::Player::Orientation::rotate270;
+        else
+            return media::Player::Orientation::rotate0;
+    }
+
     /** Sets the new audio stream role on the pulsesink in playbin */
     void set_audio_stream_role(media::Player::AudioStreamRole new_audio_role)
     {
@@ -350,6 +382,20 @@
                         &current,
                         &pending,
                         state_change_timeout.count());
+
+        if (new_state == GST_STATE_PLAYING)
+        {
+            // Only do this for video playback
+            if (media_file_type() == MEDIA_FILE_TYPE_VIDEO)
+            {
+                // Get the video height/width from the video sink
+                get_video_dimensions();
+            }
+#ifdef DEBUG_GST_PIPELINE
+            std::cout << "Dumping pipeline dot file" << std::endl;
+            GST_DEBUG_BIN_TO_DOT_FILE((GstBin*)pipeline, GST_DEBUG_GRAPH_SHOW_ALL, "pipeline");
+#endif
+        }
             break;
         }
 
@@ -366,6 +412,29 @@
                     ms.count() * 1000);
     }
 
+    void get_video_dimensions()
+    {
+        if (video_sink != nullptr && g_strcmp0(::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME"), "mirsink") == 0)
+        {
+            g_object_get (video_sink, "height", &video_height, nullptr);
+            g_object_get (video_sink, "width", &video_width, nullptr);
+            std::cout << "video_height: " << video_height << ", video_width: " << video_width << std::endl;
+            signals.on_add_frame_dimension(video_height, video_width);
+        }
+        else
+            std::cerr << "Could not get the height/width of each video frame" << std::endl;
+    }
+
+    int get_video_height() const
+    {
+        return video_height;
+    }
+
+    int get_video_width() const
+    {
+        return video_width;
+    }
+
     std::string get_file_content_type(const std::string& uri) const
     {
         if (uri.empty())
@@ -445,6 +514,9 @@
     gstreamer::Bus bus;
     MediaFileType file_type;
     SurfaceTextureClientHybris stc_hybris;
+    GstElement* video_sink;
+    uint32_t video_height;
+    uint32_t video_width;
     core::Connection on_new_message_connection;
     bool is_seeking;
     struct
@@ -458,6 +530,8 @@
         core::Signal<uint64_t> on_seeked_to;
         core::Signal<void> on_end_of_stream;
         core::Signal<media::Player::PlaybackStatus> on_playback_status_changed;
+        core::Signal<media::Player::Orientation> on_orientation_changed;
+        core::Signal<uint32_t, uint32_t> on_add_frame_dimension;
         core::Signal<void> client_disconnected;
     } signals;
 };

=== modified file 'src/core/media/mpris/player.h'
--- src/core/media/mpris/player.h	2014-09-10 21:05:34 +0000
+++ src/core/media/mpris/player.h	2014-10-22 16:15:30 +0000
@@ -122,6 +122,7 @@
         DBUS_CPP_SIGNAL_DEF(Seeked, Player, std::int64_t)
         DBUS_CPP_SIGNAL_DEF(EndOfStream, Player, void)
         DBUS_CPP_SIGNAL_DEF(PlaybackStatusChanged, Player, core::ubuntu::media::Player::PlaybackStatus)
+        DBUS_CPP_SIGNAL_DEF(VideoDimensionChanged, Player, std::uint64_t)
     };
 
     struct Properties
@@ -132,6 +133,7 @@
         DBUS_CPP_WRITABLE_PROPERTY_DEF(LoopStatus, Player, std::string)
         DBUS_CPP_WRITABLE_PROPERTY_DEF(TypedLoopStatus, Player, core::ubuntu::media::Player::LoopStatus)
         DBUS_CPP_WRITABLE_PROPERTY_DEF(AudioStreamRole, Player, core::ubuntu::media::Player::AudioStreamRole)
+        DBUS_CPP_READABLE_PROPERTY_DEF(Orientation, Player, core::ubuntu::media::Player::Orientation)
         DBUS_CPP_WRITABLE_PROPERTY_DEF(PlaybackRate, Player, double)
         DBUS_CPP_WRITABLE_PROPERTY_DEF(Rate, Player, double)
         DBUS_CPP_WRITABLE_PROPERTY_DEF(Shuffle, Player, bool)
@@ -191,6 +193,7 @@
                 Properties::Duration::ValueType duration{0};
                 Properties::MinimumRate::ValueType minimum_rate{1.f};
                 Properties::MaximumRate::ValueType maximum_rate{1.f};
+                Properties::Orientation::ValueType orientation{core::ubuntu::media::Player::Orientation::rotate0};
             } defaults;
         };
 
@@ -211,6 +214,7 @@
                   configuration.object->template get_property<Properties::LoopStatus>(),
                   configuration.object->template get_property<Properties::TypedLoopStatus>(),
                   configuration.object->template get_property<Properties::AudioStreamRole>(),
+                  configuration.object->template get_property<Properties::Orientation>(),
                   configuration.object->template get_property<Properties::PlaybackRate>(),
                   configuration.object->template get_property<Properties::Shuffle>(),
                   configuration.object->template get_property<Properties::TypedMetaData>(),
@@ -225,6 +229,7 @@
                   configuration.object->template get_signal<Signals::Seeked>(),
                   configuration.object->template get_signal<Signals::EndOfStream>(),
                   configuration.object->template get_signal<Signals::PlaybackStatusChanged>(),
+                  configuration.object->template get_signal<Signals::VideoDimensionChanged>(),
                   configuration.object->template get_signal<core::dbus::interfaces::Properties::Signals::PropertiesChanged>()
               }
         {
@@ -241,12 +246,19 @@
             properties.loop_status->set(configuration.defaults.loop_status);
             properties.typed_loop_status->set(configuration.defaults.typed_loop_status);
             properties.audio_stream_role->set(core::ubuntu::media::Player::AudioStreamRole::multimedia);
+            properties.orientation->set(core::ubuntu::media::Player::Orientation::rotate0);
             properties.playback_rate->set(configuration.defaults.playback_rate);
             properties.is_shuffle->set(configuration.defaults.shuffle);
             properties.position->set(configuration.defaults.position);
             properties.duration->set(configuration.defaults.duration);
             properties.minimum_playback_rate->set(configuration.defaults.minimum_rate);
-            properties.maximum_playback_rate->set(configuration.defaults.maximum_rate);            
+            properties.maximum_playback_rate->set(configuration.defaults.maximum_rate);
+
+            // Make sure the Orientation Property gets sent over DBus to the client
+            properties.orientation->changed().connect([this](const core::ubuntu::media::Player::Orientation& o)
+            {
+                on_property_value_changed<Properties::Orientation>(o);
+            });
 
             properties.position->changed().connect([this](std::int64_t position)
             {
@@ -266,7 +278,7 @@
             properties.loop_status->changed().connect([this](const std::string& status)
             {
                 on_property_value_changed<Properties::LoopStatus>(status);
-            });                       
+            });
         }
 
         template<typename Property>
@@ -294,6 +306,7 @@
             dict[Properties::LoopStatus::name()] = dbus::types::Variant::encode(properties.loop_status->get());
             dict[Properties::TypedLoopStatus::name()] = dbus::types::Variant::encode(properties.typed_loop_status->get());
             dict[Properties::AudioStreamRole::name()] = dbus::types::Variant::encode(properties.audio_stream_role->get());
+            dict[Properties::Orientation::name()] = dbus::types::Variant::encode(properties.orientation->get());
             dict[Properties::PlaybackRate::name()] = dbus::types::Variant::encode(properties.playback_rate->get());
             dict[Properties::Shuffle::name()] = dbus::types::Variant::encode(properties.is_shuffle->get());
             dict[Properties::Duration::name()] = dbus::types::Variant::encode(properties.duration->get());
@@ -323,6 +336,7 @@
             std::shared_ptr<core::dbus::Property<Properties::LoopStatus>> loop_status;
             std::shared_ptr<core::dbus::Property<Properties::TypedLoopStatus>> typed_loop_status;
             std::shared_ptr<core::dbus::Property<Properties::AudioStreamRole>> audio_stream_role;
+            std::shared_ptr<core::dbus::Property<Properties::Orientation>> orientation;
             std::shared_ptr<core::dbus::Property<Properties::PlaybackRate>> playback_rate;
             std::shared_ptr<core::dbus::Property<Properties::Shuffle>> is_shuffle;
             std::shared_ptr<core::dbus::Property<Properties::TypedMetaData>> typed_meta_data_for_current_track;
@@ -338,6 +352,7 @@
             typename core::dbus::Signal<Signals::Seeked, Signals::Seeked::ArgumentType>::Ptr seeked_to;
             typename core::dbus::Signal<Signals::EndOfStream, Signals::EndOfStream::ArgumentType>::Ptr end_of_stream;
             typename core::dbus::Signal<Signals::PlaybackStatusChanged, Signals::PlaybackStatusChanged::ArgumentType>::Ptr playback_status_changed;
+            typename core::dbus::Signal<Signals::VideoDimensionChanged, Signals::VideoDimensionChanged::ArgumentType>::Ptr video_dimension_changed;
 
             dbus::Signal
             <

=== modified file 'src/core/media/player_implementation.cpp'
--- src/core/media/player_implementation.cpp	2014-10-08 03:06:14 +0000
+++ src/core/media/player_implementation.cpp	2014-10-22 16:15:30 +0000
@@ -297,7 +297,7 @@
             service,
             key))
 {
-    // Initializing default values for properties
+    // Initialize default values for Player interface properties
     can_play().set(true);
     can_pause().set(true);
     can_seek().set(true);
@@ -313,6 +313,7 @@
     duration().set(0);
     audio_stream_role().set(Player::AudioStreamRole::multimedia);
     d->engine->audio_stream_role().set(Player::AudioStreamRole::multimedia);
+    orientation().set(Player::Orientation::rotate0);
 
     // Make sure that the Position property gets updated from the Engine
     // every time the client requests position
@@ -349,6 +350,13 @@
         d->engine->audio_stream_role().set(new_role);
     });
 
+    // When the value of the orientation Property is changed in the Engine by playbin,
+    // update the Player's cached value
+    d->engine->orientation().changed().connect([this](const Player::Orientation& o)
+    {
+        orientation().set(o);
+    });
+
     d->engine->about_to_finish_signal().connect([this]()
     {
         if (d->track_list->has_next())
@@ -382,6 +390,14 @@
     {
         playback_status_changed()(status);
     });
+
+    d->engine->video_dimension_changed_signal().connect([this](uint32_t height, uint32_t width)
+    {
+        uint64_t mask = 0;
+        // Left most 32 bits are for height, right most 32 bits are for width
+        mask = (static_cast<uint64_t>(height) << 32) | static_cast<uint64_t>(width);
+        video_dimension_changed()(mask);
+    });
 }
 
 media::PlayerImplementation::~PlayerImplementation()

=== modified file 'src/core/media/player_skeleton.cpp'
--- src/core/media/player_skeleton.cpp	2014-10-08 00:31:41 +0000
+++ src/core/media/player_skeleton.cpp	2014-10-22 16:15:30 +0000
@@ -57,10 +57,11 @@
           {
               skeleton.signals.seeked_to,
               skeleton.signals.end_of_stream,
-              skeleton.signals.playback_status_changed
+              skeleton.signals.playback_status_changed,
+              skeleton.signals.video_dimension_changed
           }
     {
-    }    
+    }
 
     void handle_next(const core::dbus::Message::Ptr& msg)
     {
@@ -138,7 +139,7 @@
 
         auto reply = dbus::Message::make_method_return(in);
         bus->send(reply);
-    }    
+    }
 
     bool does_client_have_access(const std::string& context, const std::string& uri)
     {
@@ -224,7 +225,7 @@
     }
 
     void handle_open_uri(const core::dbus::Message::Ptr& in)
-    {        
+    {
         dbus_stub.get_connection_app_armor_security_async(in->sender(), [this, in](const std::string& profile)
         {
             Track::UriType uri;
@@ -268,17 +269,19 @@
 
     org::freedesktop::dbus::DBus::Stub dbus_stub;
 
-    mpris::Player::Skeleton skeleton;    
+    mpris::Player::Skeleton skeleton;
 
     struct Signals
     {
         typedef core::dbus::Signal<mpris::Player::Signals::Seeked, mpris::Player::Signals::Seeked::ArgumentType> DBusSeekedToSignal;
         typedef core::dbus::Signal<mpris::Player::Signals::EndOfStream, mpris::Player::Signals::EndOfStream::ArgumentType> DBusEndOfStreamSignal;
         typedef core::dbus::Signal<mpris::Player::Signals::PlaybackStatusChanged, mpris::Player::Signals::PlaybackStatusChanged::ArgumentType> DBusPlaybackStatusChangedSignal;
+        typedef core::dbus::Signal<mpris::Player::Signals::VideoDimensionChanged, mpris::Player::Signals::VideoDimensionChanged::ArgumentType> DBusVideoDimensionChangedSignal;
 
         Signals(const std::shared_ptr<DBusSeekedToSignal>& remote_seeked,
                 const std::shared_ptr<DBusEndOfStreamSignal>& remote_eos,
-                const std::shared_ptr<DBusPlaybackStatusChangedSignal>& remote_playback_status_changed)
+                const std::shared_ptr<DBusPlaybackStatusChangedSignal>& remote_playback_status_changed,
+                const std::shared_ptr<DBusVideoDimensionChangedSignal>& remote_video_dimension_changed)
         {
             seeked_to.connect([remote_seeked](std::uint64_t value)
             {
@@ -294,11 +297,17 @@
             {
                 remote_playback_status_changed->emit(status);
             });
+
+            video_dimension_changed.connect([remote_video_dimension_changed](uint64_t mask)
+            {
+                remote_video_dimension_changed->emit(mask);
+            });
         }
 
         core::Signal<int64_t> seeked_to;
         core::Signal<void> end_of_stream;
         core::Signal<media::Player::PlaybackStatus> playback_status_changed;
+        core::Signal<uint64_t> video_dimension_changed;
     } signals;
 
 };
@@ -443,6 +452,11 @@
     return *d->skeleton.properties.audio_stream_role;
 }
 
+const core::Property<media::Player::Orientation>& media::PlayerSkeleton::orientation() const
+{
+    return *d->skeleton.properties.orientation;
+}
+
 const core::Property<media::Player::PlaybackRate>& media::PlayerSkeleton::minimum_playback_rate() const
 {
     return *d->skeleton.properties.minimum_playback_rate;
@@ -488,6 +502,11 @@
     return *d->skeleton.properties.audio_stream_role;
 }
 
+core::Property<media::Player::Orientation>& media::PlayerSkeleton::orientation()
+{
+    return *d->skeleton.properties.orientation;
+}
+
 core::Property<media::Player::PlaybackStatus>& media::PlayerSkeleton::playback_status()
 {
     return *d->skeleton.properties.typed_playback_status;
@@ -528,7 +547,6 @@
     return *d->skeleton.properties.is_audio_source;
 }
 
-
 core::Property<media::Track::MetaData>& media::PlayerSkeleton::meta_data_for_current_track()
 {
     return *d->skeleton.properties.typed_meta_data_for_current_track;
@@ -568,3 +586,13 @@
 {
     return d->signals.playback_status_changed;
 }
+
+const core::Signal<uint64_t>& media::PlayerSkeleton::video_dimension_changed() const
+{
+    return d->signals.video_dimension_changed;
+}
+
+core::Signal<uint64_t>& media::PlayerSkeleton::video_dimension_changed()
+{
+    return d->signals.video_dimension_changed;
+}

=== modified file 'src/core/media/player_skeleton.h'
--- src/core/media/player_skeleton.h	2014-09-09 14:02:52 +0000
+++ src/core/media/player_skeleton.h	2014-10-22 16:15:30 +0000
@@ -62,6 +62,7 @@
     virtual const core::Property<int64_t>& position() const;
     virtual const core::Property<int64_t>& duration() const;
     virtual const core::Property<AudioStreamRole>& audio_stream_role() const;
+    virtual const core::Property<Orientation>& orientation() const;
 
     virtual core::Property<LoopStatus>& loop_status();
     virtual core::Property<PlaybackRate>& playback_rate();
@@ -72,6 +73,7 @@
     virtual const core::Signal<int64_t>& seeked_to() const;
     virtual const core::Signal<void>& end_of_stream() const;
     virtual core::Signal<PlaybackStatus>& playback_status_changed();
+    virtual const core::Signal<uint64_t>& video_dimension_changed() const;
 
 protected:
     // All creation time arguments go here.
@@ -88,6 +90,8 @@
 
     PlayerSkeleton(const Configuration& configuration);
 
+    // These properties are not exposed to the client, but still need to be
+    // able to be settable from within the Player:
     virtual core::Property<PlaybackStatus>& playback_status();
     virtual core::Property<bool>& can_play();
     virtual core::Property<bool>& can_pause();
@@ -101,9 +105,11 @@
     virtual core::Property<PlaybackRate>& maximum_playback_rate();
     virtual core::Property<int64_t>& position();
     virtual core::Property<int64_t>& duration();
+    virtual core::Property<Orientation>& orientation();
 
     virtual core::Signal<int64_t>& seeked_to();
     virtual core::Signal<void>& end_of_stream();
+    virtual core::Signal<uint64_t>& video_dimension_changed();
 
   private:
     struct Private;

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2014-10-16 15:30:44 +0000
+++ src/core/media/player_stub.cpp	2014-10-22 16:15:30 +0000
@@ -57,6 +57,7 @@
                 object(object),
                 properties
                 {
+                    // Link the properties from the server side to the client side over the bus
                     object->get_property<mpris::Player::Properties::CanPlay>(),
                     object->get_property<mpris::Player::Properties::CanPause>(),
                     object->get_property<mpris::Player::Properties::CanSeek>(),
@@ -74,6 +75,7 @@
                     object->get_property<mpris::Player::Properties::Position>(),
                     object->get_property<mpris::Player::Properties::Duration>(),
                     object->get_property<mpris::Player::Properties::AudioStreamRole>(),
+                    object->get_property<mpris::Player::Properties::Orientation>(),
                     object->get_property<mpris::Player::Properties::MinimumRate>(),
                     object->get_property<mpris::Player::Properties::MaximumRate>()
                 },
@@ -81,7 +83,8 @@
                 {
                     object->get_signal<mpris::Player::Signals::Seeked>(),
                     object->get_signal<mpris::Player::Signals::EndOfStream>(),
-                    object->get_signal<mpris::Player::Signals::PlaybackStatusChanged>()
+                    object->get_signal<mpris::Player::Signals::PlaybackStatusChanged>(),
+                    object->get_signal<mpris::Player::Signals::VideoDimensionChanged>()
                 }
     {
     }
@@ -160,6 +163,7 @@
         std::shared_ptr<core::dbus::Property<mpris::Player::Properties::Position>> position;
         std::shared_ptr<core::dbus::Property<mpris::Player::Properties::Duration>> duration;
         std::shared_ptr<core::dbus::Property<mpris::Player::Properties::AudioStreamRole>> audio_role;
+        std::shared_ptr<core::dbus::Property<mpris::Player::Properties::Orientation>> orientation;
         std::shared_ptr<core::dbus::Property<mpris::Player::Properties::MinimumRate>> minimum_playback_rate;
         std::shared_ptr<core::dbus::Property<mpris::Player::Properties::MaximumRate>> maximum_playback_rate;
     } properties;
@@ -169,21 +173,25 @@
         typedef core::dbus::Signal<mpris::Player::Signals::Seeked, mpris::Player::Signals::Seeked::ArgumentType> DBusSeekedToSignal;
         typedef core::dbus::Signal<mpris::Player::Signals::EndOfStream, mpris::Player::Signals::EndOfStream::ArgumentType> DBusEndOfStreamSignal;
         typedef core::dbus::Signal<mpris::Player::Signals::PlaybackStatusChanged, mpris::Player::Signals::PlaybackStatusChanged::ArgumentType> DBusPlaybackStatusChangedSignal;
+        typedef core::dbus::Signal<mpris::Player::Signals::VideoDimensionChanged, mpris::Player::Signals::VideoDimensionChanged::ArgumentType> DBusVideoDimensionChangedSignal;
 
         Signals(const std::shared_ptr<DBusSeekedToSignal>& seeked,
                 const std::shared_ptr<DBusEndOfStreamSignal>& eos,
-                const std::shared_ptr<DBusPlaybackStatusChangedSignal>& status)
+                const std::shared_ptr<DBusPlaybackStatusChangedSignal>& status,
+                const std::shared_ptr<DBusVideoDimensionChangedSignal>& d)
             : dbus
               {
                   seeked,
                   eos,
-                  status
+                  status,
+                  d
               },
               playback_complete_cb(nullptr),
               playback_complete_context(nullptr),
               seeked_to(),
               end_of_stream(),
-              playback_status_changed()
+              playback_status_changed(),
+              video_dimension_changed()
         {
             dbus.seeked_to->connect([this](std::uint64_t value)
             {
@@ -204,6 +212,12 @@
                 std::cout << "PlaybackStatusChanged signal arrived via the bus." << std::endl;
                 playback_status_changed(status);
             });
+
+            dbus.video_dimension_changed->connect([this](uint64_t mask)
+            {
+                std::cout << "VideoDimensionChanged signal arrived via the bus." << std::endl;
+                video_dimension_changed(mask);
+            });
         }
 
         struct DBus
@@ -211,6 +225,7 @@
             std::shared_ptr<DBusSeekedToSignal> seeked_to;
             std::shared_ptr<DBusEndOfStreamSignal> end_of_stream;
             std::shared_ptr<DBusPlaybackStatusChangedSignal> playback_status_changed;
+            std::shared_ptr<DBusVideoDimensionChangedSignal> video_dimension_changed;
         } dbus;
 
         void set_playback_complete_cb(PlaybackCompleteCb cb, void *context)
@@ -224,6 +239,7 @@
         core::Signal<int64_t> seeked_to;
         core::Signal<void> end_of_stream;
         core::Signal<media::Player::PlaybackStatus> playback_status_changed;
+        core::Signal<uint64_t> video_dimension_changed;
     } signals;
 };
 
@@ -416,6 +432,11 @@
     return *d->properties.audio_role;
 }
 
+const core::Property<media::Player::Orientation>& media::PlayerStub::orientation() const
+{
+    return *d->properties.orientation;
+}
+
 const core::Property<media::Player::PlaybackRate>& media::PlayerStub::minimum_playback_rate() const
 {
     return *d->properties.minimum_playback_rate;
@@ -465,3 +486,8 @@
 {
     return d->signals.playback_status_changed;
 }
+
+const core::Signal<uint64_t>& media::PlayerStub::video_dimension_changed() const
+{
+    return d->signals.video_dimension_changed;
+}

=== modified file 'src/core/media/player_stub.h'
--- src/core/media/player_stub.h	2014-10-16 15:30:44 +0000
+++ src/core/media/player_stub.h	2014-10-22 16:15:30 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>
+ *              Jim Hodapp <[e-mail]>
  */
 
 #ifndef CORE_UBUNTU_MEDIA_PLAYER_STUB_H_
@@ -76,6 +77,7 @@
     virtual const core::Property<int64_t>& position() const;
     virtual const core::Property<int64_t>& duration() const;
     virtual const core::Property<AudioStreamRole>& audio_stream_role() const;
+    virtual const core::Property<Orientation>& orientation() const;
 
     virtual core::Property<LoopStatus>& loop_status();
     virtual core::Property<PlaybackRate>& playback_rate();
@@ -86,6 +88,7 @@
     virtual const core::Signal<int64_t>& seeked_to() const;
     virtual const core::Signal<void>& end_of_stream() const;
     virtual core::Signal<PlaybackStatus>& playback_status_changed();
+    virtual const core::Signal<uint64_t>& video_dimension_changed() const;
 
   private:
     struct Private;