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

[Jim Hodapp]

Error reporting all the way up to the app level from the playbin pipeline.

Error reporting all the way up to the app level from the playbin pipeline.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~jhodapp/media-hub/fix-1365497]

106. By Jim Hodapp on 2015-01-19

Code cleanup

107. By Jim Hodapp on 2015-01-19

Merged with upstream

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/media-hub-ci/221/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/61/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/61

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/media-hub-ci/222/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/62/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/62/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/62/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'include/core/media/player.h'
--- include/core/media/player.h	2014-10-23 14:42:59 +0000
+++ include/core/media/player.h	2015-01-19 23:26:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2015 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 version 3,
@@ -98,7 +98,17 @@
     enum Lifetime
     {
         normal,
-        resumable,
+        resumable
+    };
+
+    enum Error
+    {
+        no_error,
+        resource_error,
+        format_error,
+        network_error,
+        access_denied_error,
+        service_missing_error
     };
 
     Player(const Player&) = delete;
@@ -161,6 +171,9 @@
      * 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;
+    /** Signals all errors and warnings (typically from GStreamer and below) */
+    virtual const core::Signal<Error>& error() const = 0;
+
   protected:
     Player();
 

=== modified file 'src/core/media/codec.h'
--- src/core/media/codec.h	2014-10-23 14:42:59 +0000
+++ src/core/media/codec.h	2015-01-19 23:26:12 +0000
@@ -270,6 +270,46 @@
     }
 };
 
+namespace helper
+{
+template<>
+struct TypeMapper<core::ubuntu::media::Player::Error>
+{
+    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::Error>
+{
+    static void encode_argument(core::dbus::Message::Writer& out, const core::ubuntu::media::Player::Error& in)
+    {
+        out.push_int16(static_cast<std::int16_t>(in));
+    }
+
+    static void decode_argument(core::dbus::Message::Reader& out, core::ubuntu::media::Player::Error& in)
+    {
+        in = static_cast<core::ubuntu::media::Player::Error>(out.pop_int16());
+    }
+};
+
 }
 }
 

=== modified file 'src/core/media/engine.h'
--- src/core/media/engine.h	2014-11-11 23:59:07 +0000
+++ src/core/media/engine.h	2015-01-19 23:26:12 +0000
@@ -109,6 +109,7 @@
     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;
+    virtual const core::Signal<core::ubuntu::media::Player::Error>& error_signal() const = 0;
 
     virtual void reset() = 0;
 };

=== modified file 'src/core/media/gstreamer/engine.cpp'
--- src/core/media/gstreamer/engine.cpp	2014-11-11 23:59:07 +0000
+++ src/core/media/gstreamer/engine.cpp	2015-01-19 23:26:12 +0000
@@ -55,6 +55,76 @@
         (void) state_change;
     }
 
+    // Converts from a GStreamer GError to a media::Player:Error enum
+    media::Player::Error from_gst_errorwarning(const gstreamer::Bus::Message::Detail::ErrorWarningInfo& ewi)
+    {
+        if (g_strcmp0(g_quark_to_string(ewi.error->domain), "gst-core-error-quark") == 0)
+        {
+            switch (ewi.error->code)
+            {
+            case GST_CORE_ERROR_NEGOTIATION:
+                return media::Player::Error::resource_error;
+            case GST_CORE_ERROR_MISSING_PLUGIN:
+                return media::Player::Error::format_error;
+            default:
+                std::cerr << "Got an unhandled core error: '"
+                    << ewi.debug << "' (code: " << ewi.error->code << ")" << std::endl;
+                return media::Player::Error::no_error;
+            }
+        }
+        else if (g_strcmp0(g_quark_to_string(ewi.error->domain), "gst-resource-error-quark") == 0)
+        {
+            switch (ewi.error->code)
+            {
+            case GST_RESOURCE_ERROR_NOT_FOUND:
+            case GST_RESOURCE_ERROR_OPEN_READ:
+            case GST_RESOURCE_ERROR_OPEN_WRITE:
+            case GST_RESOURCE_ERROR_READ:
+            case GST_RESOURCE_ERROR_WRITE:
+                return media::Player::Error::resource_error;
+            case GST_RESOURCE_ERROR_NOT_AUTHORIZED:
+                return media::Player::Error::access_denied_error;
+            default:
+                std::cerr << "Got an unhandled resource error: '"
+                    << ewi.debug << "' (code: " << ewi.error->code << ")" << std::endl;
+                return media::Player::Error::no_error;
+            }
+        }
+        else if (g_strcmp0(g_quark_to_string(ewi.error->domain), "gst-stream-error-quark") == 0)
+        {
+            switch (ewi.error->code)
+            {
+            case GST_STREAM_ERROR_CODEC_NOT_FOUND:
+                return media::Player::Error::format_error;
+            default:
+                std::cerr << "Got an unhandled stream error: '"
+                    << ewi.debug << "' (code: " << ewi.error->code << ")" << std::endl;
+                return media::Player::Error::no_error;
+            }
+        }
+
+        return media::Player::Error::no_error;
+    }
+
+    void on_playbin_error(const gstreamer::Bus::Message::Detail::ErrorWarningInfo& ewi)
+    {
+        const media::Player::Error e = from_gst_errorwarning(ewi);
+        if (e != media::Player::Error::no_error)
+            error(e);
+    }
+
+    void on_playbin_warning(const gstreamer::Bus::Message::Detail::ErrorWarningInfo& ewi)
+    {
+        const media::Player::Error e = from_gst_errorwarning(ewi);
+        if (e != media::Player::Error::no_error)
+            error(e);
+    }
+
+    void on_playbin_info(const gstreamer::Bus::Message::Detail::ErrorWarningInfo& ewi)
+    {
+        std::cerr << "Got a playbin info message (no action taken): " << ewi.debug << std::endl;
+    }
+
     void on_tag_available(const gstreamer::Bus::Message::Detail::Tag& tag)
     {
         media::Track::MetaData md;
@@ -127,6 +197,24 @@
                       &Private::on_playbin_state_changed,
                       this,
                       std::placeholders::_1))),
+          on_error_connection(
+              playbin.signals.on_error.connect(
+                  std::bind(
+                      &Private::on_playbin_error,
+                      this,
+                      std::placeholders::_1))),
+          on_warning_connection(
+              playbin.signals.on_warning.connect(
+                  std::bind(
+                      &Private::on_playbin_warning,
+                      this,
+                      std::placeholders::_1))),
+          on_info_connection(
+              playbin.signals.on_info.connect(
+                  std::bind(
+                      &Private::on_playbin_info,
+                      this,
+                      std::placeholders::_1))),
           on_tag_available_connection(
               playbin.signals.on_tag_available.connect(
                   std::bind(
@@ -201,6 +289,9 @@
 
     core::ScopedConnection about_to_finish_connection;
     core::ScopedConnection on_state_changed_connection;
+    core::ScopedConnection on_error_connection;
+    core::ScopedConnection on_warning_connection;
+    core::ScopedConnection on_info_connection;
     core::ScopedConnection on_tag_available_connection;
     core::ScopedConnection on_volume_changed_connection;
     core::ScopedConnection on_audio_stream_role_changed_connection;
@@ -217,6 +308,7 @@
     core::Signal<void> end_of_stream;
     core::Signal<media::Player::PlaybackStatus> playback_status_changed;
     core::Signal<uint32_t, uint32_t> video_dimension_changed;
+    core::Signal<media::Player::Error> error;
 };
 
 gstreamer::Engine::Engine() : d(new Private{})
@@ -413,6 +505,11 @@
     return d->video_dimension_changed;
 }
 
+const core::Signal<core::ubuntu::media::Player::Error>& gstreamer::Engine::error_signal() const
+{
+    return d->error;
+}
+
 void gstreamer::Engine::reset()
 {
     d->playbin.reset();

=== modified file 'src/core/media/gstreamer/engine.h'
--- src/core/media/gstreamer/engine.h	2014-11-11 23:59:07 +0000
+++ src/core/media/gstreamer/engine.h	2015-01-19 23:26:12 +0000
@@ -67,6 +67,7 @@
     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;
+    const core::Signal<core::ubuntu::media::Player::Error>& error_signal() const;
 
     void reset();
 

=== modified file 'src/core/media/mpris/player.h'
--- src/core/media/mpris/player.h	2014-10-23 14:42:59 +0000
+++ src/core/media/mpris/player.h	2015-01-19 23:26:12 +0000
@@ -124,6 +124,7 @@
         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)
+        DBUS_CPP_SIGNAL_DEF(Error, Player, core::ubuntu::media::Player::Error)
     };
 
     struct Properties
@@ -233,6 +234,7 @@
                   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<Signals::Error>(),
                   configuration.object->template get_signal<core::dbus::interfaces::Properties::Signals::PropertiesChanged>()
               }
         {
@@ -359,6 +361,7 @@
             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;
+            typename core::dbus::Signal<Signals::Error, Signals::Error::ArgumentType>::Ptr error;
 
             dbus::Signal
             <

=== modified file 'src/core/media/player_implementation.cpp'
--- src/core/media/player_implementation.cpp	2014-11-11 23:59:07 +0000
+++ src/core/media/player_implementation.cpp	2015-01-19 23:26:12 +0000
@@ -422,6 +422,11 @@
         mask = (static_cast<uint64_t>(height) << 32) | static_cast<uint64_t>(width);
         video_dimension_changed()(mask);
     });
+
+    d->engine->error_signal().connect([this](const Player::Error& e)
+    {
+        error()(e);
+    });
 }
 
 media::PlayerImplementation::~PlayerImplementation()

=== modified file 'src/core/media/player_implementation.h'
--- src/core/media/player_implementation.h	2014-10-01 00:48:25 +0000
+++ src/core/media/player_implementation.h	2015-01-19 23:26:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2014 Canonical Ltd.
+ * Copyright © 2013-2015 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 version 3,

=== modified file 'src/core/media/player_skeleton.cpp'
--- src/core/media/player_skeleton.cpp	2014-10-23 17:29:29 +0000
+++ src/core/media/player_skeleton.cpp	2015-01-19 23:26:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2014 Canonical Ltd.
+ * Copyright © 2013-2015 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 version 3,
@@ -58,7 +58,8 @@
               skeleton.signals.seeked_to,
               skeleton.signals.end_of_stream,
               skeleton.signals.playback_status_changed,
-              skeleton.signals.video_dimension_changed
+              skeleton.signals.video_dimension_changed,
+              skeleton.signals.error
           }
     {
     }
@@ -294,11 +295,13 @@
         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;
+        typedef core::dbus::Signal<mpris::Player::Signals::Error, mpris::Player::Signals::Error::ArgumentType> DBusErrorSignal;
 
         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<DBusVideoDimensionChangedSignal>& remote_video_dimension_changed)
+                const std::shared_ptr<DBusVideoDimensionChangedSignal>& remote_video_dimension_changed,
+                const std::shared_ptr<DBusErrorSignal>& remote_error)
         {
             seeked_to.connect([remote_seeked](std::uint64_t value)
             {
@@ -319,12 +322,18 @@
             {
                 remote_video_dimension_changed->emit(mask);
             });
+
+            error.connect([remote_error](const media::Player::Error& e)
+            {
+                remote_error->emit(e);
+            });
         }
 
         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;
+        core::Signal<media::Player::Error> error;
     } signals;
 
 };
@@ -629,3 +638,13 @@
 {
     return d->signals.video_dimension_changed;
 }
+
+core::Signal<media::Player::Error>& media::PlayerSkeleton::error()
+{
+    return d->signals.error;
+}
+
+const core::Signal<media::Player::Error>& media::PlayerSkeleton::error() const
+{
+    return d->signals.error;
+}

=== modified file 'src/core/media/player_skeleton.h'
--- src/core/media/player_skeleton.h	2014-10-23 14:42:59 +0000
+++ src/core/media/player_skeleton.h	2015-01-19 23:26:12 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013-2014 Canonical Ltd
+ * Copyright (C) 2013-2015 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 version 3,
@@ -76,6 +76,7 @@
     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;
+    virtual const core::Signal<Error>& error() const;
 
 protected:
     // All creation time arguments go here.
@@ -112,6 +113,7 @@
     virtual core::Signal<int64_t>& seeked_to();
     virtual core::Signal<void>& end_of_stream();
     virtual core::Signal<uint64_t>& video_dimension_changed();
+    virtual core::Signal<Error>& error();
 
   private:
     struct Private;

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2014-11-11 23:59:07 +0000
+++ src/core/media/player_stub.cpp	2015-01-19 23:26:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2014 Canonical Ltd.
+ * Copyright © 2013-2015 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 version 3,
@@ -85,7 +85,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::VideoDimensionChanged>()
+                    object->get_signal<mpris::Player::Signals::VideoDimensionChanged>(),
+                    object->get_signal<mpris::Player::Signals::Error>()
                 }
     {
         auto op = object->invoke_method_synchronously<mpris::Player::Key, media::Player::PlayerKey>();
@@ -178,23 +179,27 @@
         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;
+        typedef core::dbus::Signal<mpris::Player::Signals::Error, mpris::Player::Signals::Error::ArgumentType> DBusErrorSignal;
 
         Signals(const std::shared_ptr<DBusSeekedToSignal>& seeked,
                 const std::shared_ptr<DBusEndOfStreamSignal>& eos,
                 const std::shared_ptr<DBusPlaybackStatusChangedSignal>& status,
-                const std::shared_ptr<DBusVideoDimensionChangedSignal>& d)
+                const std::shared_ptr<DBusVideoDimensionChangedSignal>& d,
+                const std::shared_ptr<DBusErrorSignal>& e)
             : playback_complete_cb(nullptr),
               playback_complete_context(nullptr),
               seeked_to(),
               end_of_stream(),
               playback_status_changed(),
               video_dimension_changed(),
+              error(),
               dbus
               {
                   seeked,
                   eos,
                   status,
-                  d
+                  d,
+                  e
               }
         {
             dbus.seeked_to->connect([this](std::uint64_t value)
@@ -222,7 +227,13 @@
                 std::cout << "VideoDimensionChanged signal arrived via the bus." << std::endl;
                 video_dimension_changed(mask);
             });
-        }       
+
+            dbus.error->connect([this](const media::Player::Error& e)
+            {
+                std::cout << "Error signal arrived via the bus (Error: " << e << ")" << std::endl;
+                error(e);
+            });
+        }
 
         void set_playback_complete_cb(PlaybackCompleteCb cb, void *context)
         {
@@ -236,6 +247,7 @@
         core::Signal<void> end_of_stream;
         core::Signal<media::Player::PlaybackStatus> playback_status_changed;
         core::Signal<uint64_t> video_dimension_changed;
+        core::Signal<media::Player::Error> error;
 
         struct DBus
         {
@@ -243,6 +255,7 @@
             std::shared_ptr<DBusEndOfStreamSignal> end_of_stream;
             std::shared_ptr<DBusPlaybackStatusChangedSignal> playback_status_changed;
             std::shared_ptr<DBusVideoDimensionChangedSignal> video_dimension_changed;
+            std::shared_ptr<DBusErrorSignal> error;
         } dbus;
     } signals;
 };
@@ -512,3 +525,8 @@
 {
     return d->signals.video_dimension_changed;
 }
+
+const core::Signal<media::Player::Error>& media::PlayerStub::error() const
+{
+    return d->signals.error;
+}

=== modified file 'src/core/media/player_stub.h'
--- src/core/media/player_stub.h	2014-10-23 14:42:59 +0000
+++ src/core/media/player_stub.h	2015-01-19 23:26:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2015 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 version 3,
@@ -92,6 +92,7 @@
     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;
+    virtual const core::Signal<Error>& error() const;
 
   private:
     struct Private;