Merge lp:~phablet-team/media-hub/fix-black-video-bugs into lp:media-hub

[Jim Hodapp]

Only send the video_dimensions_changed signal if the dimensions actually changed. Also, no longer need is_eos flag.

Only send the video_dimensions_changed signal if the dimensions actually changed. Also, no longer need is_eos flag.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/media-hub-ci/361/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/201
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/201

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2015-06-01 21:34:46 +0000
+++ src/core/media/gstreamer/playbin.cpp	2015-06-16 14:42:38 +0000
@@ -100,8 +100,10 @@
                   std::placeholders::_1))),
       is_seeking(false),
       previous_position(0),
+      cached_video_dimensions{
+        core::ubuntu::media::video::Height{0},
+        core::ubuntu::media::video::Width{0}},
       player_lifetime(media::Player::Lifetime::normal),
-      is_eos(false),
       about_to_finish_handler_id(0),
       source_setup_handler_id(0)
 {
@@ -208,7 +210,6 @@
         }
         break;
     case GST_MESSAGE_EOS:
-        is_eos = true;
         signals.on_end_of_stream();
     default:
         break;
@@ -450,14 +451,15 @@
     }
 
     // We only should query the pipeline if we actually succeeded in
-    // setting the requested state. Also don't send on_video_dimensions_changed
-    // signal during EOS.
-    if (result && new_state == GST_STATE_PLAYING && !is_eos)
+    // setting the requested state.
+    if (result && new_state == GST_STATE_PLAYING)
     {
         // Get the video height/width from the video sink
         try
         {
-            signals.on_video_dimensions_changed(get_video_dimensions());
+            const core::ubuntu::media::video::Dimensions new_dimensions = get_video_dimensions();
+            emit_video_dimensions_changed_if_changed(new_dimensions);
+            cached_video_dimensions = new_dimensions;
         }
         catch (const std::exception& e)
         {
@@ -499,6 +501,7 @@
     uint32_t video_width = 0, video_height = 0;
     g_object_get (video_sink, "height", &video_height, nullptr);
     g_object_get (video_sink, "width", &video_width, nullptr);
+
     // TODO(tvoss): We should probably check here if width and height are valid.
     return core::ubuntu::media::video::Dimensions
     {
@@ -507,6 +510,14 @@
     };
 }
 
+void gstreamer::Playbin::emit_video_dimensions_changed_if_changed(const core::ubuntu::media::video::Dimensions &new_dimensions)
+{
+    // Only signal the application layer if the dimensions have in fact changed. This might happen
+    // if reusing the same media-hub session to play two different video sources.
+    if (new_dimensions != cached_video_dimensions)
+        signals.on_video_dimensions_changed(new_dimensions);
+}
+
 std::string gstreamer::Playbin::get_file_content_type(const std::string& uri) const
 {
     if (uri.empty())

=== modified file 'src/core/media/gstreamer/playbin.h'
--- src/core/media/gstreamer/playbin.h	2015-06-01 21:34:46 +0000
+++ src/core/media/gstreamer/playbin.h	2015-06-16 14:42:38 +0000
@@ -101,6 +101,7 @@
     bool seek(const std::chrono::microseconds& ms);
 
     core::ubuntu::media::video::Dimensions get_video_dimensions() const;
+    void emit_video_dimensions_changed_if_changed(const core::ubuntu::media::video::Dimensions &new_dimensions);
 
     std::string get_file_content_type(const std::string& uri) const;
 
@@ -116,9 +117,9 @@
     core::Connection on_new_message_connection_async;
     bool is_seeking;
     mutable uint64_t previous_position;
+    core::ubuntu::media::video::Dimensions cached_video_dimensions;
     core::ubuntu::media::Player::HeadersType request_headers;
     core::ubuntu::media::Player::Lifetime player_lifetime;
-    bool is_eos;
     gulong about_to_finish_handler_id;
     gulong source_setup_handler_id;
     struct