Merge lp:~thomas-voss/media-hub/introduce-video-sink-interface into lp:media-hub

[Thomas Voß]

Refactor client-facing interfaces to pull out explicit dependency on hybris-based media layer.
Introduce interface media::video::Sink, and expose it in interfaces
Adjust implementation to account for interface changes.
Introduce an implementation of media::video::Sink relying on Hybris.

Refactor client-facing interfaces to pull out explicit dependency on hybris-based media layer.
Introduce interface media::video::Sink, and expose it in interfaces
Adjust implementation to account for interface changes.
Introduce an implementation of media::video::Sink relying on Hybris.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/media-hub-ci/176/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/16/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

100. By Thomas Voß on 2014-11-26

Adjust debian/*.install and debian/*.symbols to account for major version bump.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/media-hub-ci/193/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/33/console

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good, just 1 inline comment below. Also, make sure to rebase with trunk changes. This would be the very first MR I'd like to see get put into a silo so that I can test it well. This is a nice limited-scope MR but still is important. I want to try to avoid having to test all of the MRs combined in one silo, but instead would like to incrementally test one or 2 MRs at a time and land, then test 1 or two more and land, etc.

review: Needs Fixing (code)

[Thomas Voß (thomas-voss)]

> Looks good, just 1 inline comment below. Also, make sure to rebase with trunk
> changes.

They should be up to date, and the train takes care of remerging with trunk.

> This would be the very first MR I'd like to see get put into a silo
> so that I can test it well. This is a nice limited-scope MR but still is
> important. I want to try to avoid having to test all of the MRs combined in
> one silo, but instead would like to incrementally test one or 2 MRs at a time
> and land, then test 1 or two more and land, etc.

Well, I wonder if we could at least group together the introduce-MRs into one silo and collectively test them to avoid retesting the same thing over and over again.

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

101. By Thomas Voß on 2014-12-03

Adjust comment according to review.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/media-hub-ci/197/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/37/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

102. By Thomas Voß on 2014-12-04

[ Jim Hodapp ]
* Resubmitting with prerequisite branch (LP: #1331041)
[ Justin McPherson ]
* Resubmitting with prerequisite branch (LP: #1331041)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/media-hub-ci/198/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/38/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

103. By Thomas Voß on 2014-12-08

Adjust major version in CMake setup.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/media-hub-ci/199/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/39/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/39

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good

review: Approve (code)

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

104. By Thomas Voß on 2015-01-23

Default to Hybris based implemenations.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/media-hub-ci/223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/63/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

105. By Thomas Voß on 2015-01-26

[ Jim Hodapp ]
* Error reporting all the way up to the app level from the playbin
  pipeline.
[ Ubuntu daily release ]
* New rebuild forced
[ Jim Hodapp ]
* Don't auto-resume playback of videos after a phone call ends. (LP:
  #1411273)
[ Ubuntu daily release ]
* New rebuild forced
[ Ricardo Salveti de Araujo ]
* service_implementation: adding debug for call started/ended signals.
  Make sure account and connection are available when setting up
  account manager (patch from Gustavo Boiko). call_monitor: don't
  check caps when hooking up on/off signals, until bug 1409125 is
  fixed. Enable parallel building . (LP: #1409125)
[ Jim Hodapp ]
* Pause playback when recording begins. (LP: #1398047)
[ Ricardo Salveti de Araujo ]
* call_monitor.cpp: waiting for bridge to be up, and also protecting
  the on_change call (LP: #1408137)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/media-hub-ci/231/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/71/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

106. By Thomas Voß on 2015-01-26

Fix FTBFS.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

107. By Thomas Voß on 2015-01-29

Funnel creation of video::Sink instances via a factory to allow for early initialization
tasks that should/have to be carried out as soon as the player's identity on the service
side is established and the respective key is known.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/introduce-video-sink-interface]

108. By Thomas Voß on 2015-03-12

* debian/control:
  - Removing pre-depends that are not required
  - Bumping standards-version to 3.9.6
[ Ricardo Salveti de Araujo ]
* Migrating tests to use ogg instead of mp3/avi removed:
  tests/h264.avi tests/test.mp3 added: tests/test-audio-1.ogg
  tests/test-video.ogg tests/test.mp3 renamed: tests/test.ogg =>
  tests/test-audio.ogg

109. By Thomas Voß on 2015-03-12

Remove Pre-Depends as trunk suggests.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-13 23:50:01 +0000
+++ CMakeLists.txt	2015-03-12 11:38:55 +0000
@@ -2,7 +2,7 @@
 
 project(ubuntu-media-hub)
 
-set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 2)
+set(UBUNTU_MEDIA_HUB_VERSION_MAJOR 3)
 set(UBUNTU_MEDIA_HUB_VERSION_MINOR 0)
 set(UBUNTU_MEDIA_HUB_VERSION_PATCH 0)
 
@@ -30,6 +30,8 @@
 pkg_check_modules(GIO gio-2.0 REQUIRED)
 pkg_check_modules(HYBRIS_MEDIA libmedia REQUIRED)
 
+add_definitions(-DMEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER)
+
 #####################################################################
 # Enable code coverage calculation with gcov/gcovr/lcov
 # Usage:

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-12 03:06:40 +0000
+++ debian/changelog	2015-03-12 11:38:55 +0000
@@ -1,3 +1,9 @@
+media-hub (3.0.0) UNRELEASED; urgency=medium
+
+  * Refactor client-facing interfaces to pull out explicit dependency on hybris-based media layer.
+
+ -- Thomas Voss <[e-mail]>  Tue, 11 Nov 2014 17:15:52 +0100
+
 media-hub (2.0.0+15.04.20150303-0ubuntu2) vivid; urgency=medium
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2015-03-12 03:06:29 +0000
+++ debian/control	2015-03-12 11:38:55 +0000
@@ -39,8 +39,8 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libmedia-hub-common2 (= ${binary:Version}),
-         libmedia-hub-client2 (= ${binary:Version}),
+Depends: libmedia-hub-common3 (= ${binary:Version}),
+         libmedia-hub-client3 (= ${binary:Version}),
          ${misc:Depends},
          libproperties-cpp-dev,
 Suggests: libmedia-hub-doc
@@ -61,7 +61,7 @@
  .
  This package contains the runtime.
 
-Package: libmedia-hub-common2
+Package: libmedia-hub-common3
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -72,7 +72,7 @@
  .
  This package contains the common libraries.
 
-Package: libmedia-hub-client2
+Package: libmedia-hub-client3
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},

=== renamed file 'debian/libmedia-hub-client2.install' => 'debian/libmedia-hub-client3.install'
=== renamed file 'debian/libmedia-hub-common2.install' => 'debian/libmedia-hub-common3.install'
=== renamed file 'debian/libmedia-hub-common2.symbols' => 'debian/libmedia-hub-common3.symbols'
--- debian/libmedia-hub-common2.symbols	2014-09-10 21:11:00 +0000
+++ debian/libmedia-hub-common3.symbols	2015-03-12 11:38:55 +0000
@@ -1,2 +1,2 @@
-libmedia-hub-common.so.2 libmedia-hub-common2 #MINVER#
+libmedia-hub-common.so.3 libmedia-hub-common3 #MINVER#
  (c++)"core::ubuntu::media::the_session_bus()@Base" 2.0.0+14.10.20140910.2

=== modified file 'include/core/media/player.h'
--- include/core/media/player.h	2015-01-19 21:48:01 +0000
+++ include/core/media/player.h	2015-03-12 11:38:55 +0000
@@ -20,6 +20,7 @@
 #define CORE_UBUNTU_MEDIA_PLAYER_H_
 
 #include <core/media/track.h>
+#include <core/media/video/sink.h>
 
 #include <core/property.h>
 
@@ -44,10 +45,15 @@
     typedef void* GLConsumerWrapperHybris;
     typedef std::map<std::string, std::string> HeadersType;
 
-    /** Used to set a callback function to be called when a frame is ready to be rendered **/
-    typedef void (*FrameAvailableCbHybris)(GLConsumerWrapperHybris wrapper, void *context);
-    typedef void (*FrameAvailableCb)(void *context);
-    typedef void (*PlaybackCompleteCb)(void *context);
+    struct Errors
+    {
+        Errors() = delete;
+
+        struct OutOfProcessBufferStreamingNotSupported : public std::runtime_error
+        {
+            OutOfProcessBufferStreamingNotSupported();
+        };
+    };
 
     struct Configuration;
 
@@ -120,10 +126,10 @@
     virtual std::shared_ptr<TrackList> track_list() = 0;
     virtual PlayerKey key() const = 0;
 
+    virtual video::Sink::Ptr create_gl_texture_video_sink(std::uint32_t texture_id) = 0;
+
     virtual bool open_uri(const Track::UriType& uri) = 0;
     virtual bool open_uri(const Track::UriType& uri, const HeadersType&) = 0;
-    virtual void create_video_sink(uint32_t texture_id) = 0;
-    virtual GLConsumerWrapperHybris gl_consumer() const = 0;
     virtual void next() = 0;
     virtual void previous() = 0;
     virtual void play() = 0;
@@ -131,10 +137,6 @@
     virtual void stop() = 0;
     virtual void seek_to(const std::chrono::microseconds& offset) = 0;
 
-    // TODO: Convert this to be a signal
-    virtual void set_frame_available_callback(FrameAvailableCb cb, void *context) = 0;
-    virtual void set_playback_complete_callback(PlaybackCompleteCb cb, void *context) = 0;
-
     virtual const core::Property<bool>& can_play() const = 0;
     virtual const core::Property<bool>& can_pause() const = 0;
     virtual const core::Property<bool>& can_seek() const = 0;

=== added directory 'include/core/media/video'
=== added file 'include/core/media/video/sink.h'
--- include/core/media/video/sink.h	1970-01-01 00:00:00 +0000
+++ include/core/media/video/sink.h	2015-03-12 11:38:55 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef CORE_UBUNTU_MEDIA_VIDEO_SINK_H_
+#define CORE_UBUNTU_MEDIA_VIDEO_SINK_H_
+
+#include <core/signal.h>
+
+#include <memory>
+
+namespace core
+{
+namespace ubuntu
+{
+namespace media
+{
+namespace video
+{
+/** @brief A video sink abstracts a queue of buffers, that receives
+  * a stream of decoded video buffers from an arbitrary source.
+  */
+struct Sink
+{
+    /** @brief To save us some typing. */
+    typedef std::shared_ptr<Sink> Ptr;
+
+    /** @cond */
+    Sink() = default;
+    Sink(const Sink&) = delete;
+    virtual ~Sink() = default;
+
+    Sink& operator=(const Sink&) = delete;
+    /** @endcond */
+
+    /**
+     * @brief The signal is emitted whenever a new frame is available and a subsequent
+     * call to swap_buffers will not block and return true.
+     */
+    virtual const core::Signal<void>& frame_available() const = 0;
+
+    /**
+     * @brief Queries the 4x4 transformation matrix for the current frame, placing the data into 'matrix'.
+     * @param matrix [out] The destination array representing the matrix in column-major format.
+     *                     We expect at least 4*4 float elements in the array.
+     * @returns true iff the data has been set. Returns false and leaves 'matrix' unchanged in case of issues.
+     */
+    virtual bool transformation_matrix(float* matrix) const = 0;
+
+    /**
+     * @brief Releases the current buffer, and consumes the next buffer in the queue,
+     * making it available for consumption by consumers of this API in an
+     * implementation-specific way. Clients will usually rely on a GL texture
+     * to receive the latest buffer.
+     */
+    virtual bool swap_buffers() const = 0;
+};
+}
+}
+}
+}
+
+#endif // CORE_UBUNTU_MEDIA_VIDEO_SINK_H_

=== modified file 'src/core/media/CMakeLists.txt'
--- src/core/media/CMakeLists.txt	2014-11-12 19:10:24 +0000
+++ src/core/media/CMakeLists.txt	2015-03-12 11:38:55 +0000
@@ -6,7 +6,10 @@
 # out all symbols that are not in core::ubuntu::media*
 set(symbol_map "${CMAKE_SOURCE_DIR}/symbols.map")
 
-file(GLOB MPRIS_HEADERS mpris/ *.h)
+file(GLOB_RECURSE MEDIA_HUB_HEADERS ${CMAKE_SOURCE_DIR}/include/*.h)
+file(GLOB MPRIS_HEADERS mpris/*.h)
+
+message(STATUS ${MEDIA_HUB_HEADERS})
 
 add_subdirectory(call-monitor)
 
@@ -36,6 +39,8 @@
 add_library(
   media-hub-client SHARED
 
+  ${MEDIA_HUB_HEADERS}
+
   player.cpp
   service.cpp
   track.cpp
@@ -44,6 +49,9 @@
   player_stub.cpp
   service_stub.cpp
   track_list_stub.cpp
+
+  video/hybris_gl_sink.cpp
+  video/platform_default_sink.cpp
 )
 
 set_target_properties(
@@ -75,6 +83,7 @@
 add_library(
     media-hub-service
 
+    ${MEDIA_HUB_HEADERS}
     ${MPRIS_HEADERS}
 
     cover_art_resolver.cpp

=== modified file 'src/core/media/engine.h'
--- src/core/media/engine.h	2015-01-13 14:18:59 +0000
+++ src/core/media/engine.h	2015-03-12 11:38:55 +0000
@@ -75,8 +75,10 @@
 
     virtual const core::Property<State>& state() const = 0;
 
-    virtual bool open_resource_for_uri(const Track::UriType& uri) = 0;
+    virtual bool open_resource_for_uri(const core::ubuntu::media::Track::UriType& uri) = 0;
     virtual bool open_resource_for_uri(const core::ubuntu::media::Track::UriType& uri, const Player::HeadersType&) = 0;
+    // Throws core::ubuntu::media::Player::Error::OutOfProcessBufferStreamingNotSupported if the implementation does not
+    // support this feature.
     virtual void create_video_sink(uint32_t texture_id) = 0;
 
     virtual bool play() = 0;

=== modified file 'src/core/media/mpris/player.h'
--- src/core/media/mpris/player.h	2015-01-13 14:18:59 +0000
+++ src/core/media/mpris/player.h	2015-03-12 11:38:55 +0000
@@ -103,6 +103,17 @@
         static constexpr const char* stopped{"Stopped"};
     };
 
+    struct Error
+    {
+        struct OutOfProcessBufferStreamingNotSupported
+        {
+            static constexpr const char* name
+            {
+                "mpris.Player.Error.OutOfProcessBufferStreamingNotSupported"
+            };
+        };
+    };
+
     typedef std::map<std::string, core::dbus::types::Variant> Dictionary;
 
     DBUS_CPP_METHOD_DEF(Next, Player)

=== modified file 'src/core/media/player.cpp'
--- src/core/media/player.cpp	2014-09-09 10:28:32 +0000
+++ src/core/media/player.cpp	2015-03-12 11:38:55 +0000
@@ -22,6 +22,11 @@
 
 namespace media = core::ubuntu::media;
 
+media::Player::Errors::OutOfProcessBufferStreamingNotSupported::OutOfProcessBufferStreamingNotSupported()
+    : std::runtime_error{"Implementation does not support out-of-process buffer streaming"}
+{
+}
+
 const media::Player::Configuration& media::Player::Client::default_configuration()
 {
     static const media::Player::Configuration config

=== modified file 'src/core/media/player_implementation.cpp'
--- src/core/media/player_implementation.cpp	2015-01-13 14:18:59 +0000
+++ src/core/media/player_implementation.cpp	2015-03-12 11:38:55 +0000
@@ -470,6 +470,12 @@
     return d->key;
 }
 
+media::video::Sink::Ptr media::PlayerImplementation::create_gl_texture_video_sink(std::uint32_t texture_id)
+{
+    d->engine->create_video_sink(texture_id);
+    return media::video::Sink::Ptr{};
+}
+
 bool media::PlayerImplementation::open_uri(const Track::UriType& uri)
 {
     return d->engine->open_resource_for_uri(uri);
@@ -480,17 +486,6 @@
     return d->engine->open_resource_for_uri(uri, headers);
 }
 
-void media::PlayerImplementation::create_video_sink(uint32_t texture_id)
-{
-    d->engine->create_video_sink(texture_id);
-}
-
-media::Player::GLConsumerWrapperHybris media::PlayerImplementation::gl_consumer() const
-{
-    // This method is client-side only and is simply a no-op for the service side
-    return NULL;
-}
-
 void media::PlayerImplementation::next()
 {
 }
@@ -515,18 +510,6 @@
     d->engine->stop();
 }
 
-void media::PlayerImplementation::set_frame_available_callback(
-    UNUSED FrameAvailableCb cb, UNUSED void *context)
-{
-    // This method is client-side only and is simply a no-op for the service side
-}
-
-void media::PlayerImplementation::set_playback_complete_callback(
-    UNUSED PlaybackCompleteCb cb, UNUSED void *context)
-{
-    // This method is client-side only and is simply a no-op for the service side
-}
-
 void media::PlayerImplementation::seek_to(const std::chrono::microseconds& ms)
 {
     d->engine->seek_to(ms);

=== modified file 'src/core/media/player_implementation.h'
--- src/core/media/player_implementation.h	2015-01-13 14:18:59 +0000
+++ src/core/media/player_implementation.h	2015-03-12 11:38:55 +0000
@@ -46,17 +46,15 @@
     virtual std::shared_ptr<TrackList> track_list();
     virtual PlayerKey key() const;
 
+    virtual video::Sink::Ptr create_gl_texture_video_sink(std::uint32_t texture_id);
+
     virtual bool open_uri(const Track::UriType& uri);
     virtual bool open_uri(const Track::UriType& uri, const Player::HeadersType& headers);
-    virtual void create_video_sink(uint32_t texture_id);
-    virtual GLConsumerWrapperHybris gl_consumer() const;
     virtual void next();
     virtual void previous();
     virtual void play();
     virtual void pause();
     virtual void stop();
-    virtual void set_frame_available_callback(FrameAvailableCb cb, void *context);
-    virtual void set_playback_complete_callback(PlaybackCompleteCb cb, void *context);
     virtual void seek_to(const std::chrono::microseconds& offset);
 
     const core::Signal<>& on_client_disconnected() const;

=== modified file 'src/core/media/player_skeleton.cpp'
--- src/core/media/player_skeleton.cpp	2015-01-13 14:18:59 +0000
+++ src/core/media/player_skeleton.cpp	2015-03-12 11:38:55 +0000
@@ -136,9 +136,29 @@
     {
         uint32_t texture_id;
         in->reader() >> texture_id;
-        impl->create_video_sink(texture_id);
-
-        auto reply = dbus::Message::make_method_return(in);
+
+        core::dbus::Message::Ptr reply;
+
+        try
+        {
+            impl->create_gl_texture_video_sink(texture_id);
+            reply = dbus::Message::make_method_return(in);
+        }
+        catch (const media::Player::Errors::OutOfProcessBufferStreamingNotSupported& e)
+        {
+            reply = dbus::Message::make_error(
+                        in,
+                        mpris::Player::Error::OutOfProcessBufferStreamingNotSupported::name,
+                        e.what());
+        }
+        catch (...)
+        {
+            reply = dbus::Message::make_error(
+                        in,
+                        mpris::Player::Error::OutOfProcessBufferStreamingNotSupported::name,
+                        std::string{});
+        }
+
         bus->send(reply);
     }
 

=== modified file 'src/core/media/player_stub.cpp'
--- src/core/media/player_stub.cpp	2015-01-19 18:38:29 +0000
+++ src/core/media/player_stub.cpp	2015-03-12 11:38:55 +0000
@@ -19,6 +19,7 @@
 
 #include <core/media/service.h>
 #include <core/media/track_list.h>
+#include <core/media/video/platform_default_sink.h>
 
 #include "codec.h"
 #include "player_stub.h"
@@ -48,13 +49,9 @@
     Private(const std::shared_ptr<Service>& parent,
             const std::shared_ptr<core::dbus::Object>& object
             ) : parent(parent),
-                texture_id(0),
-                igbc_wrapper(nullptr),
-                glc_wrapper(nullptr),
-                decoding_session(nullptr),
-                frame_available_cb(nullptr),
-                frame_available_context(nullptr),
                 object(object),
+                key(object->invoke_method_synchronously<mpris::Player::Key, media::Player::PlayerKey>().value()),
+                sink_factory(media::video::make_platform_default_sink_factory(key)),
                 properties
                 {
                     // Link the properties from the server side to the client side over the bus
@@ -89,64 +86,17 @@
                     object->get_signal<mpris::Player::Signals::Error>()
                 }
     {
-        auto op = object->invoke_method_synchronously<mpris::Player::Key, media::Player::PlayerKey>();
-        decoding_session = decoding_service_create_session(op.value());
     }
 
     ~Private()
     {
     }
 
-    static void on_frame_available_cb(UNUSED GLConsumerWrapperHybris wrapper, void *context)
-    {
-        if (context != nullptr) {
-            Private *p = static_cast<Private*>(context);
-            p->on_frame_available();
-        }
-        else
-            std::cerr << "context is nullptr, can't call on_frame_available()" << std::endl;
-    }
-
-    void on_frame_available()
-    {
-        if (frame_available_cb != nullptr) {
-            frame_available_cb(frame_available_context);
-        }
-        else
-            std::cerr << "frame_available_cb is nullptr, can't call frame_available_cb()" << std::endl;
-    }
-
-    void set_frame_available_cb(FrameAvailableCb cb, void *context)
-    {
-        frame_available_cb = cb;
-        frame_available_context = context;
-
-        gl_consumer_set_frame_available_cb(glc_wrapper, &Private::on_frame_available_cb, static_cast<void*>(this));
-    }
-
-    /** We need a GLConsumerHybris instance for doing texture streaming over the
-     * process boundary **/
-    void get_gl_consumer()
-    {
-        igbc_wrapper = decoding_service_get_igraphicbufferconsumer();
-        glc_wrapper = gl_consumer_create_by_id_with_igbc(texture_id, igbc_wrapper);
-
-    }
-
     std::shared_ptr<Service> parent;
     std::shared_ptr<TrackList> track_list;
-
-    uint32_t texture_id;
-    IGBCWrapperHybris igbc_wrapper;
-    GLConsumerWrapperHybris glc_wrapper;
-
-    DSSessionWrapperHybris decoding_session;
-
-    FrameAvailableCb frame_available_cb;
-    void *frame_available_context;
-
     dbus::Object::Ptr object;
-
+    media::Player::PlayerKey key;
+    media::video::SinkFactory sink_factory;
     struct
     {
         std::shared_ptr<core::dbus::Property<mpris::Player::Properties::CanPlay>> can_play;
@@ -186,9 +136,7 @@
                 const std::shared_ptr<DBusPlaybackStatusChangedSignal>& status,
                 const std::shared_ptr<DBusVideoDimensionChangedSignal>& d,
                 const std::shared_ptr<DBusErrorSignal>& e)
-            : playback_complete_cb(nullptr),
-              playback_complete_context(nullptr),
-              seeked_to(),
+            : seeked_to(),
               end_of_stream(),
               playback_status_changed(),
               video_dimension_changed(),
@@ -211,8 +159,6 @@
             dbus.end_of_stream->connect([this]()
             {
                 std::cout << "EndOfStream signal arrived via the bus." << std::endl;
-                if (playback_complete_cb)
-                    playback_complete_cb(playback_complete_context);
                 end_of_stream();
             });
 
@@ -235,14 +181,6 @@
             });
         }
 
-        void set_playback_complete_cb(PlaybackCompleteCb cb, void *context)
-        {
-            playback_complete_cb = cb;
-            playback_complete_context = context;
-        }
-
-        PlaybackCompleteCb playback_complete_cb;
-        void *playback_complete_context;
         core::Signal<int64_t> seeked_to;
         core::Signal<void> end_of_stream;
         core::Signal<media::Player::PlaybackStatus> playback_status_changed;
@@ -284,9 +222,7 @@
 
 media::Player::PlayerKey media::PlayerStub::key() const
 {
-    auto op = d->object->invoke_method_synchronously<mpris::Player::Key, media::Player::PlayerKey>();
-
-    return op.value();
+    return d->key;
 }
 
 bool media::PlayerStub::open_uri(const media::Track::UriType& uri)
@@ -296,6 +232,7 @@
     return op.value();
 }
 
+
 bool media::PlayerStub::open_uri(const Track::UriType& uri, const Player::HeadersType& headers)
 {
     auto op = d->object->invoke_method_synchronously<mpris::Player::OpenUriExtended, bool>(uri, headers);
@@ -303,19 +240,19 @@
     return op.value();
 }
 
-void media::PlayerStub::create_video_sink(uint32_t texture_id)
+media::video::Sink::Ptr media::PlayerStub::create_gl_texture_video_sink(std::uint32_t texture_id)
 {
     auto op = d->object->invoke_method_synchronously<mpris::Player::CreateVideoSink, void>(texture_id);
-    d->texture_id = texture_id;
-    d->get_gl_consumer();
 
     if (op.is_error())
-        throw std::runtime_error("Problem creating new video sink instance on remote object");
-}
+    {
+        if (op.error().name() == mpris::Player::Error::OutOfProcessBufferStreamingNotSupported::name)
+            throw media::Player::Errors::OutOfProcessBufferStreamingNotSupported{};
+        else
+            throw std::runtime_error{op.error().print()};
+    }
 
-GLConsumerWrapperHybris media::PlayerStub::gl_consumer() const
-{
-    return d->glc_wrapper;
+    return d->sink_factory(texture_id);
 }
 
 void media::PlayerStub::next()
@@ -366,16 +303,6 @@
         throw std::runtime_error("Problem stopping playback on remote object");
 }
 
-void media::PlayerStub::set_frame_available_callback(FrameAvailableCb cb, void *context)
-{
-    d->set_frame_available_cb(cb, context);
-}
-
-void media::PlayerStub::set_playback_complete_callback(PlaybackCompleteCb cb, void *context)
-{
-    d->signals.set_playback_complete_cb(cb, context);
-}
-
 const core::Property<bool>& media::PlayerStub::can_play() const
 {
     return *d->properties.can_play;

=== modified file 'src/core/media/player_stub.h'
--- src/core/media/player_stub.h	2015-01-13 14:18:59 +0000
+++ src/core/media/player_stub.h	2015-03-12 11:38:55 +0000
@@ -46,10 +46,10 @@
     virtual std::shared_ptr<TrackList> track_list();
     virtual PlayerKey key() const;
 
+    virtual video::Sink::Ptr create_gl_texture_video_sink(std::uint32_t texture_id);
+
     virtual bool open_uri(const Track::UriType& uri);
     virtual bool open_uri(const Track::UriType& uri, const Player::HeadersType& headers);
-    virtual void create_video_sink(uint32_t texture_id);
-    virtual GLConsumerWrapperHybris gl_consumer() const;
     virtual void next();
     virtual void previous();
     virtual void play();
@@ -57,9 +57,6 @@
     virtual void seek_to(const std::chrono::microseconds& offset);
     virtual void stop();
 
-    virtual void set_frame_available_callback(FrameAvailableCb cb, void *context);
-    virtual void set_playback_complete_callback(PlaybackCompleteCb cb, void *context);
-
     virtual const core::Property<bool>& can_play() const;
     virtual const core::Property<bool>& can_pause() const;
     virtual const core::Property<bool>& can_seek() const;

=== added directory 'src/core/media/video'
=== added file 'src/core/media/video/hybris_gl_sink.cpp'
--- src/core/media/video/hybris_gl_sink.cpp	1970-01-01 00:00:00 +0000
+++ src/core/media/video/hybris_gl_sink.cpp	2015-03-12 11:38:55 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright © 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <core/media/video/hybris_gl_sink.h>
+
+#if defined(MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER)
+// Hybris
+#include <hybris/media/media_codec_layer.h>
+#include <hybris/media/surface_texture_client_hybris.h>
+
+namespace media = core::ubuntu::media;
+namespace video = core::ubuntu::media::video;
+
+struct video::HybrisGlSink::Private
+{
+    static void on_frame_available_callback(GLConsumerWrapperHybris, void* context)
+    {
+        if (not context)
+            return;
+
+        auto thiz = static_cast<Private*>(context);
+
+        thiz->frame_available();
+    }
+
+    Private(std::uint32_t gl_texture)
+        : gl_texture{gl_texture},
+          graphics_buffer_consumer{decoding_service_get_igraphicbufferconsumer()},
+          gl_texture_consumer{gl_consumer_create_by_id_with_igbc(gl_texture, graphics_buffer_consumer)}
+    {
+        if (not graphics_buffer_consumer) throw std::runtime_error
+        {
+            "video::HybrisGlSink: Could not connect to remote buffer queue."
+        };
+
+        if (not gl_texture_consumer) throw std::runtime_error
+        {
+            "video::HybrisGlSink: Could not associate local texture id with remote buffer streak."
+        };
+
+        gl_consumer_set_frame_available_cb(gl_texture_consumer, Private::on_frame_available_callback, this);
+    }
+
+    ~Private()
+    {
+        gl_consumer_set_frame_available_cb(gl_texture_consumer, Private::on_frame_available_callback, nullptr);
+    }
+
+    std::uint32_t gl_texture;
+    core::Signal<void> frame_available;
+    IGBCWrapperHybris graphics_buffer_consumer;
+    GLConsumerWrapperHybris gl_texture_consumer;
+};
+
+std::function<video::Sink::Ptr(std::uint32_t)> video::HybrisGlSink::factory_for_key(const media::Player::PlayerKey& key)
+{
+    // It's okay-ish to use static map here. Point being that we currently have no way
+    // of terminating the session with the decoding service anyway.
+    static std::map<media::Player::PlayerKey, DSSessionWrapperHybris> lut;
+    static std::mutex lut_guard;
+
+    // Scoping access to the lut to ensure that the lock is kept for as short as possible.
+    {
+        std::lock_guard<std::mutex> lg{lut_guard};
+        if (lut.count(key) == 0)
+            lut[key] = decoding_service_create_session(key);
+    }
+
+    return [](std::uint32_t texture)
+    {
+        return video::Sink::Ptr{new video::HybrisGlSink{texture}};
+    };
+}
+
+video::HybrisGlSink::HybrisGlSink(std::uint32_t gl_texture) : d{new Private{gl_texture}}
+{
+}
+
+video::HybrisGlSink::~HybrisGlSink()
+{
+}
+
+const core::Signal<void>& video::HybrisGlSink::frame_available() const
+{
+    return d->frame_available;
+}
+
+bool video::HybrisGlSink::transformation_matrix(float* matrix) const
+{
+    // TODO: The underlying API really should tell us if everything is ok.
+    gl_consumer_get_transformation_matrix(d->gl_texture_consumer, matrix);
+    return true;
+}
+
+bool video::HybrisGlSink::swap_buffers() const
+{
+    // TODO: The underlying API really should tell us if everything is ok.
+    gl_consumer_update_texture(d->gl_texture_consumer);
+    return true;
+}
+#endif // MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER

=== added file 'src/core/media/video/hybris_gl_sink.h'
--- src/core/media/video/hybris_gl_sink.h	1970-01-01 00:00:00 +0000
+++ src/core/media/video/hybris_gl_sink.h	2015-03-12 11:38:55 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef CORE_UBUNTU_MEDIA_VIDEO_HYBRIS_GL_SINK_H_
+#define CORE_UBUNTU_MEDIA_VIDEO_HYBRIS_GL_SINK_H_
+
+#include <core/media/video/sink.h>
+
+#include <core/media/player.h>
+
+#include <functional>
+
+namespace core
+{
+namespace ubuntu
+{
+namespace media
+{
+namespace video
+{
+class HybrisGlSink : public video::Sink
+{
+public:    
+    // Returns a factory functor that allows for creating actual sink instances.
+    static std::function<video::Sink::Ptr(std::uint32_t)> factory_for_key(const media::Player::PlayerKey&);
+
+    // Need this to avoid std::unique_ptr complaining about forward-declared Private.
+    ~HybrisGlSink();
+
+    // The signal is emitted whenever a new frame is available and a subsequent
+    // call to swap_buffers will not block and return true.
+    const core::Signal<void>& frame_available() const override;
+
+    // Queries the transformation matrix for the current frame, placing the data into 'matrix'
+    // and returns true or returns false and leaves 'matrix' unchanged in case
+    // of issues.
+    bool transformation_matrix(float* matrix) const override;
+
+    // Releases the current buffer, and consumes the next buffer in the queue,
+    // making it available for consumption by consumers of this API in an
+    // implementation-specific way. Clients will usually rely on a GL texture
+    // to receive the latest buffer.
+    bool swap_buffers() const override;
+
+private:
+    // Creates a new instance for the given gl texture, connecting to the remote part known
+    // under the given key or throw in case of issues.
+    HybrisGlSink(std::uint32_t gl_texture);
+
+    struct Private;
+    std::unique_ptr<Private> d;
+};
+}
+}
+}
+}
+
+#endif // CORE_UBUNTU_MEDIA_VIDEO_HYBRIS_GL_SINK_H_

=== added file 'src/core/media/video/platform_default_sink.cpp'
--- src/core/media/video/platform_default_sink.cpp	1970-01-01 00:00:00 +0000
+++ src/core/media/video/platform_default_sink.cpp	2015-03-12 11:38:55 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <core/media/video/platform_default_sink.h>
+
+namespace media = core::ubuntu::media;
+namespace video = core::ubuntu::media::video;
+
+namespace
+{
+struct NullSink : public video::Sink
+{
+    // The signal is emitted whenever a new frame is available and a subsequent
+    // call to swap_buffers will not block and return true.
+    const core::Signal<void>& frame_available() const
+    {
+        return signal_frame_available;
+    }
+
+    // Queries the transformation matrix for the current frame, placing the data into 'matrix'
+    // and returns true or returns false and leaves 'matrix' unchanged in case
+    // of issues.
+    bool transformation_matrix(float*) const
+    {        
+        return true;
+    }
+
+    // Releases the current buffer, and consumes the next buffer in the queue,
+    // making it available for consumption by consumers of this API in an
+    // implementation-specific way. Clients will usually rely on a GL texture
+    // to receive the latest buffer.
+    bool swap_buffers() const
+    {
+        return true;
+    }
+
+    core::Signal<void> signal_frame_available;
+};
+}
+
+#if defined(MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER)
+#include <core/media/video/hybris_gl_sink.h>
+
+video::SinkFactory video::make_platform_default_sink_factory(const media::Player::PlayerKey& key)
+{
+    return video::HybrisGlSink::factory_for_key(key);
+}
+#else  // MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER
+video::SinkFactory video::make_platform_default_sink_factory(const media::Player::PlayerKey&)
+{
+    return [](std::uint32_t) { return video::Sink::Ptr{}; };
+}
+#endif // MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER

=== added file 'src/core/media/video/platform_default_sink.h'
--- src/core/media/video/platform_default_sink.h	1970-01-01 00:00:00 +0000
+++ src/core/media/video/platform_default_sink.h	2015-03-12 11:38:55 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 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 version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef CORE_UBUNTU_MEDIA_VIDEO_PLATFORM_DEFAULT_SINK_H_
+#define CORE_UBUNTU_MEDIA_VIDEO_PLATFORM_DEFAULT_SINK_H_
+
+#include <core/media/video/sink.h>
+
+#include <core/media/player.h>
+
+#include <functional>
+
+namespace core
+{
+namespace ubuntu
+{
+namespace media
+{
+namespace video
+{
+// A functor that allows for creating actual sinks given a texture id.
+typedef std::function<Sink::Ptr(std::uint32_t)> SinkFactory;
+// Returns the platform default sink factory for the player instance identified by the given key.
+SinkFactory make_platform_default_sink_factory(const Player::PlayerKey& key);
+}
+}
+}
+}
+
+#endif // CORE_UBUNTU_MEDIA_VIDEO_PLATFORM_DEFAULT_SINK_H_