Merge lp:~jhodapp/media-hub/fix-1435088 into lp:media-hub

[Jim Hodapp]

Fix issues with not reporting failed decoding error to the client.

Fix issues with not reporting failed decoding error to the client.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Code and reasoning looks fine.

This doesn't fix the "Fail to connect with playback backend" issues. Think the media-hub is hanging.

review: Approve

=== modified file 'src/core/media/gstreamer/engine.cpp'
--- src/core/media/gstreamer/engine.cpp	2015-04-03 22:52:08 +0000
+++ src/core/media/gstreamer/engine.cpp	2015-05-01 20:02:25 +0000
@@ -49,10 +49,27 @@
 
 struct gstreamer::Engine::Private
 {
-    void on_playbin_state_changed(
-            const gstreamer::Bus::Message::Detail::StateChanged& state_change)
-    {
-        (void) state_change;
+    media::Player::PlaybackStatus gst_state_to_player_status(const gstreamer::Bus::Message::Detail::StateChanged& state)
+    {
+        if (state.new_state == GST_STATE_PLAYING)
+            return media::Player::PlaybackStatus::playing;
+        else if (state.new_state == GST_STATE_PAUSED)
+            return media::Player::PlaybackStatus::paused;
+        else if (state.new_state == GST_STATE_READY)
+            return media::Player::PlaybackStatus::ready;
+        else if (state.new_state == GST_STATE_NULL)
+            return media::Player::PlaybackStatus::null;
+        else
+            return media::Player::PlaybackStatus::stopped;
+    }
+
+    void on_playbin_state_changed(const std::pair<gstreamer::Bus::Message::Detail::StateChanged,std::string>& p)
+    {
+        if (p.second == "playbin")
+        {
+            std::cout << "State changed on playbin: " << p.first.new_state << std::endl;
+            playback_status_changed(gst_state_to_player_status(p.first));
+        }
     }
 
     // Converts from a GStreamer GError to a media::Player:Error enum
@@ -95,6 +112,7 @@
             switch (ewi.error->code)
             {
             case GST_STREAM_ERROR_CODEC_NOT_FOUND:
+            case GST_STREAM_ERROR_DECODE:
                 return media::Player::Error::format_error;
             default:
                 std::cerr << "Got an unhandled stream error: '"

=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2015-05-01 20:02:25 +0000
+++ src/core/media/gstreamer/playbin.cpp	2015-05-01 20:02:25 +0000
@@ -194,7 +194,7 @@
         }
         break;
     case GST_MESSAGE_STATE_CHANGED:
-        signals.on_state_changed(message.detail.state_changed);
+        signals.on_state_changed(std::make_pair(message.detail.state_changed, message.source));
         break;
     case GST_MESSAGE_ASYNC_DONE:
         if (is_seeking)

=== modified file 'src/core/media/gstreamer/playbin.h'
--- src/core/media/gstreamer/playbin.h	2015-04-15 17:13:58 +0000
+++ src/core/media/gstreamer/playbin.h	2015-05-01 20:02:25 +0000
@@ -125,7 +125,7 @@
         core::Signal<Bus::Message::Detail::ErrorWarningInfo> on_warning;
         core::Signal<Bus::Message::Detail::ErrorWarningInfo> on_info;
         core::Signal<Bus::Message::Detail::Tag> on_tag_available;
-        core::Signal<Bus::Message::Detail::StateChanged> on_state_changed;
+        core::Signal<std::pair<Bus::Message::Detail::StateChanged,std::string>> on_state_changed;
         core::Signal<uint64_t> on_seeked_to;
         core::Signal<void> on_end_of_stream;
         core::Signal<core::ubuntu::media::Player::PlaybackStatus> on_playback_status_changed;

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2015-04-17 16:45:47 +0000
+++ src/core/media/player_stub.cpp	2015-05-01 20:02:25 +0000
@@ -177,7 +177,7 @@
 
             dbus.playback_status_changed->connect([this](const media::Player::PlaybackStatus& status)
             {
-                std::cout << "PlaybackStatusChanged signal arrived via the bus." << std::endl;
+                std::cout << "PlaybackStatusChanged signal arrived via the bus (Status: " << status << ")" << std::endl;
                 playback_status_changed(status);
             });