Merge lp:~thomas-voss/media-hub/move-playbin-implementation-to-cpp-file into lp:media-hub

[Thomas Voß]

Move gstreamer::Playbin implementation to its own cpp file, thus internalizing the Hybris setup portions.
Make sure that media-hub-service knows about media::Player::Error::OutOfProcessBufferStreamingNotSupported by linking with media-hub-client.

Move gstreamer::Playbin implementation to its own cpp file, thus internalizing the Hybris setup portions.
Make sure that media-hub-service knows about media::Player::Error::OutOfProcessBufferStreamingNotSupported by linking with media-hub-client.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/move-playbin-implementation-to-cpp-file]

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

Remerge prereq branch.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good

review: Approve (code)

[lp:~thomas-voss/media-hub/move-playbin-implementation-to-cpp-file]

105. By Thomas Voß on 2014-12-11

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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~thomas-voss/media-hub/move-playbin-implementation-to-cpp-file]

106. 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:106
http://jenkins.qa.ubuntu.com/job/media-hub-ci/227/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/67/console

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/move-playbin-implementation-to-cpp-file]

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

Merge prereq branch.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The jenkins node for the i386 build failed, I've restarted a new ci run.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/media-hub/move-playbin-implementation-to-cpp-file]

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

Merge prereq branch.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~thomas-voss/media-hub/move-playbin-implementation-to-cpp-file]

109. 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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/core/media/CMakeLists.txt'
--- src/core/media/CMakeLists.txt	2015-03-12 11:42:10 +0000
+++ src/core/media/CMakeLists.txt	2015-03-12 11:42:10 +0000
@@ -93,6 +93,7 @@
     recorder_observer.cpp
     hybris_recorder_observer.cpp
     gstreamer/engine.cpp
+    gstreamer/playbin.cpp
 
     player_skeleton.cpp
     player_implementation.cpp
@@ -105,6 +106,7 @@
 target_link_libraries(
   media-hub-service
 
+  media-hub-client
   media-hub-common
   call-monitor
   ${DBUS_LIBRARIES}

=== modified file 'src/core/media/gstreamer/engine.cpp'
--- src/core/media/gstreamer/engine.cpp	2015-03-12 11:42:10 +0000
+++ src/core/media/gstreamer/engine.cpp	2015-03-12 11:42:10 +0000
@@ -333,7 +333,7 @@
 
 bool gstreamer::Engine::open_resource_for_uri(const media::Track::UriType& uri)
 {
-    d->playbin.set_uri(uri);
+    d->playbin.set_uri(uri, core::ubuntu::media::Player::HeadersType{});
     return true;
 }
 

=== added file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	1970-01-01 00:00:00 +0000
+++ src/core/media/gstreamer/playbin.cpp	2015-03-12 11:42:10 +0000
@@ -0,0 +1,556 @@
+/*
+ * Copyright © 2013 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/gstreamer/playbin.h>
+
+#include <core/media/gstreamer/engine.h>
+
+#if defined(MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER)
+#include <hybris/media/surface_texture_client_hybris.h>
+#include <hybris/media/media_codec_layer.h>
+
+namespace
+{
+void setup_video_sink_for_buffer_streaming(GstElement* video_sink)
+{
+    // Get the service-side BufferQueue (IGraphicBufferProducer) and associate it with
+    // the SurfaceTextureClientHybris instance
+    IGBPWrapperHybris igbp = decoding_service_get_igraphicbufferproducer();
+    SurfaceTextureClientHybris stc = surface_texture_client_create_by_igbp(igbp);
+    // Because mirsink is being loaded, we are definitely doing * hardware rendering.
+    surface_texture_client_set_hardware_rendering (stc, TRUE);
+    g_object_set (G_OBJECT (video_sink), "surface", static_cast<gpointer>(stc), static_cast<char*>(NULL));
+}
+}
+#else  // MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER
+namespace
+{
+void setup_video_sink_for_buffer_streaming(GstElement*)
+{
+    throw core::ubuntu::media::Player::Error::OutOfProcessBufferStreamingNotSupported{};
+}
+}
+#endif // MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER
+
+namespace
+{
+bool is_mir_video_sink()
+{
+    return g_strcmp0(::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME"), "mirsink") == 0;
+}
+}
+// 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 video = core::ubuntu::media::video;
+
+const std::string& gstreamer::Playbin::pipeline_name()
+{
+    static const std::string s{"playbin"};
+    return s;
+}
+
+void gstreamer::Playbin::about_to_finish(GstElement*, gpointer user_data)
+{
+    auto thiz = static_cast<Playbin*>(user_data);
+    thiz->signals.about_to_finish();
+}
+
+void gstreamer::Playbin::source_setup(GstElement*,
+                                      GstElement *source,
+                                      gpointer user_data)
+{
+    if (user_data == nullptr)
+        return;
+
+    static_cast<Playbin*>(user_data)->setup_source(source);
+}
+
+gstreamer::Playbin::Playbin()
+    : 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),
+      on_new_message_connection(
+          bus.on_new_message.connect(
+              std::bind(
+                  &Playbin::on_new_message,
+                  this,
+                  std::placeholders::_1))),
+      is_seeking(false),
+      player_lifetime(media::Player::Lifetime::normal)
+{
+    if (!pipeline)
+        throw std::runtime_error("Could not create pipeline for playbin.");
+
+    // Add audio and/or video sink elements depending on environment variables
+    // being set or not set
+    setup_pipeline_for_audio_video();
+
+    g_signal_connect(
+                pipeline,
+                "about-to-finish",
+                G_CALLBACK(about_to_finish),
+                this
+                );
+
+    g_signal_connect(
+        pipeline,
+        "source-setup",
+        G_CALLBACK(source_setup),
+        this
+        );
+}
+
+gstreamer::Playbin::~Playbin()
+{
+    if (pipeline)
+        gst_object_unref(pipeline);
+}
+
+void gstreamer::Playbin::reset()
+{
+    std::cout << "Client died, resetting pipeline" << std::endl;
+    // When the client dies, tear down the current pipeline and get it
+    // in a state that is ready for the next client that connects to the
+    // service
+
+    // Don't reset the pipeline if we want to resume
+    if (player_lifetime != media::Player::Lifetime::resumable) {
+        reset_pipeline();
+    }
+    // Signal to the Player class that the client side has disconnected
+    signals.client_disconnected();
+}
+
+void gstreamer::Playbin::reset_pipeline()
+{
+    std::cout << __PRETTY_FUNCTION__ << std::endl;
+    auto ret = gst_element_set_state(pipeline, GST_STATE_NULL);
+    switch(ret)
+    {
+    case GST_STATE_CHANGE_FAILURE:
+        std::cout << "Failed to reset the pipeline state. Client reconnect may not function properly." << std::endl;
+        break;
+    case GST_STATE_CHANGE_NO_PREROLL:
+    case GST_STATE_CHANGE_SUCCESS:
+    case GST_STATE_CHANGE_ASYNC:
+        break;
+    default:
+        std::cout << "Failed to reset the pipeline state. Client reconnect may not function properly." << std::endl;
+    }
+    file_type = MEDIA_FILE_TYPE_NONE;
+}
+
+void gstreamer::Playbin::on_new_message(const Bus::Message& message)
+{
+    switch(message.type)
+    {
+    case GST_MESSAGE_ERROR:
+        signals.on_error(message.detail.error_warning_info);
+        break;
+    case GST_MESSAGE_WARNING:
+        signals.on_warning(message.detail.error_warning_info);
+        break;
+    case GST_MESSAGE_INFO:
+        signals.on_info(message.detail.error_warning_info);
+        break;
+    case GST_MESSAGE_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);
+        break;
+    case GST_MESSAGE_ASYNC_DONE:
+        if (is_seeking)
+        {
+            // FIXME: Pass the actual playback time position to the signal call
+            signals.on_seeked_to(0);
+            is_seeking = false;
+        }
+        break;
+    case GST_MESSAGE_EOS:
+        signals.on_end_of_stream();
+    default:
+        break;
+    }
+}
+
+gstreamer::Bus& gstreamer::Playbin::message_bus()
+{
+    return bus;
+}
+
+void gstreamer::Playbin::setup_pipeline_for_audio_video()
+{
+    gint flags;
+    g_object_get (pipeline, "flags", &flags, nullptr);
+    flags |= GST_PLAY_FLAG_AUDIO;
+    flags |= GST_PLAY_FLAG_VIDEO;
+    flags &= ~GST_PLAY_FLAG_TEXT;
+    g_object_set (pipeline, "flags", flags, nullptr);
+
+    if (::getenv("CORE_UBUNTU_MEDIA_SERVICE_AUDIO_SINK_NAME") != nullptr)
+    {
+        auto audio_sink = gst_element_factory_make (
+                    ::getenv("CORE_UBUNTU_MEDIA_SERVICE_AUDIO_SINK_NAME"),
+                    "audio-sink");
+
+        std::cout << "audio_sink: " << ::getenv("CORE_UBUNTU_MEDIA_SERVICE_AUDIO_SINK_NAME") << std::endl;
+
+        g_object_set (
+                    pipeline,
+                    "audio-sink",
+                    audio_sink,
+                    NULL);
+    }
+
+    if (::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME") != nullptr)
+    {
+        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;
+
+        g_object_set (
+                pipeline,
+                "video-sink",
+                video_sink,
+                NULL);
+    }
+}
+
+void gstreamer::Playbin::create_video_sink(uint32_t)
+{
+    if (not video_sink) throw std::logic_error
+    {
+        "No video sink configured for the current pipeline"
+    };
+
+    setup_video_sink_for_buffer_streaming(video_sink);
+}
+
+void gstreamer::Playbin::set_volume(double new_volume)
+{
+    g_object_set (pipeline, "volume", new_volume, NULL);
+}
+
+/** Translate the AudioStreamRole enum into a string */
+std::string gstreamer::Playbin::get_audio_role_str(media::Player::AudioStreamRole audio_role)
+{
+    switch (audio_role)
+    {
+        case media::Player::AudioStreamRole::alarm:
+            return "alarm";
+            break;
+        case media::Player::AudioStreamRole::alert:
+            return "alert";
+            break;
+        case media::Player::AudioStreamRole::multimedia:
+            return "multimedia";
+            break;
+        case media::Player::AudioStreamRole::phone:
+            return "phone";
+            break;
+        default:
+            return "multimedia";
+            break;
+    }
+}
+
+media::Player::Orientation gstreamer::Playbin::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 gstreamer::Playbin::set_audio_stream_role(media::Player::AudioStreamRole new_audio_role)
+{
+    GstElement *audio_sink = NULL;
+    g_object_get (pipeline, "audio-sink", &audio_sink, NULL);
+
+    std::string role_str("props,media.role=" + get_audio_role_str(new_audio_role));
+    std::cout << "Audio stream role: " << role_str << std::endl;
+
+    GstStructure *props = gst_structure_from_string (role_str.c_str(), NULL);
+    if (audio_sink != nullptr && props != nullptr)
+        g_object_set (audio_sink, "stream-properties", props, NULL);
+    else
+    {
+        std::cerr <<
+            "Warning: couldn't set audio stream role - couldn't get audio_sink from pipeline" <<
+            std::endl;
+    }
+
+    gst_structure_free (props);
+}
+
+void gstreamer::Playbin::set_lifetime(media::Player::Lifetime lifetime)
+{
+    player_lifetime = lifetime;
+}
+
+uint64_t gstreamer::Playbin::position() const
+{
+    int64_t pos = 0;
+    gst_element_query_position (pipeline, GST_FORMAT_TIME, &pos);
+
+    // FIXME: this should be int64_t, but dbus-cpp doesn't seem to handle it correctly
+    return static_cast<uint64_t>(pos);
+}
+
+uint64_t gstreamer::Playbin::duration() const
+{
+    int64_t dur = 0;
+    gst_element_query_duration (pipeline, GST_FORMAT_TIME, &dur);
+
+    // FIXME: this should be int64_t, but dbus-cpp doesn't seem to handle it correctly
+    return static_cast<uint64_t>(dur);
+}
+
+void gstreamer::Playbin::set_uri(
+    const std::string& uri,
+    const core::ubuntu::media::Player::HeadersType& headers = core::ubuntu::media::Player::HeadersType())
+{
+    reset_pipeline();
+
+    g_object_set(pipeline, "uri", uri.c_str(), NULL);
+    if (is_video_file(uri))
+        file_type = MEDIA_FILE_TYPE_VIDEO;
+    else if (is_audio_file(uri))
+        file_type = MEDIA_FILE_TYPE_AUDIO;
+    
+    request_headers = headers;
+}
+
+void gstreamer::Playbin::setup_source(GstElement *source)
+{
+    if (source == NULL || request_headers.empty())
+        return;
+    
+    if (request_headers.find("Cookie") != request_headers.end()) {
+        if (g_object_class_find_property(G_OBJECT_GET_CLASS(source),
+                                         "cookies") != NULL) {
+            gchar ** cookies = g_strsplit(request_headers["Cookie"].c_str(), ";", 0);
+            g_object_set(source, "cookies", cookies, NULL);
+            g_strfreev(cookies);
+        }
+    }
+    
+    if (request_headers.find("User-Agent") != request_headers.end()) {
+        if (g_object_class_find_property(G_OBJECT_GET_CLASS(source),
+                                         "user-agent") != NULL) {
+            g_object_set(source, "user-agent", request_headers["User-Agent"].c_str(), NULL);
+        }
+    }
+}
+
+std::string gstreamer::Playbin::uri() const
+{
+    gchar* data = nullptr;
+    g_object_get(pipeline, "current-uri", &data, nullptr);
+
+    std::string result((data == nullptr ? "" : data));
+    g_free(data);
+
+    return result;
+}
+
+bool gstreamer::Playbin::set_state_and_wait(GstState new_state)
+{
+    static const std::chrono::nanoseconds state_change_timeout
+    {
+        // We choose a quite high value here as tests are run under valgrind
+        // and gstreamer pipeline setup/state changes take longer in that scenario.
+        // The value does not negatively impact runtime performance.
+        std::chrono::milliseconds{5000}
+    };
+
+    auto ret = gst_element_set_state(pipeline, new_state);
+    bool result = false; GstState current, pending;
+    switch(ret)
+    {
+    case GST_STATE_CHANGE_FAILURE:
+        result = false; break;
+    case GST_STATE_CHANGE_NO_PREROLL:
+    case GST_STATE_CHANGE_SUCCESS:
+        result = true; break;
+    case GST_STATE_CHANGE_ASYNC:
+        result = GST_STATE_CHANGE_SUCCESS == gst_element_get_state(
+                    pipeline,
+                    &current,
+                    &pending,
+                    state_change_timeout.count());    
+        break;
+    }
+
+    // We only should query the pipeline if we actually succeeded in
+    // 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());
+        }
+        catch (const std::exception& e)
+        {
+            std::cerr << "Problem querying video dimensions: " << e.what() << std::endl;
+        }
+        catch (...)
+        {
+            std::cerr << "Problem querying video dimensions." << std::endl;
+        }
+
+#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
+    }
+
+    return result;
+}
+
+bool gstreamer::Playbin::seek(const std::chrono::microseconds& ms)
+{
+    is_seeking = true;
+    return gst_element_seek_simple(
+                pipeline,
+                GST_FORMAT_TIME,
+                (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT),
+                ms.count() * 1000);
+}
+
+core::ubuntu::media::video::Dimensions gstreamer::Playbin::get_video_dimensions() const
+{
+    if (not video_sink || not is_mir_video_sink())
+        throw std::runtime_error
+        {
+            "Missing video sink or video sink does not support query of width and height."
+        };
+
+    // Initialize to default value prior to querying actual values from the sink.
+    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
+    {
+        core::ubuntu::media::video::Height{video_height},
+        core::ubuntu::media::video::Width{video_width}
+    };
+}
+
+std::string gstreamer::Playbin::get_file_content_type(const std::string& uri) const
+{
+    if (uri.empty())
+        return std::string();
+
+    std::string filename(uri);
+    std::cout << "filename: " << filename << std::endl;
+    size_t pos = uri.find("file://");
+    if (pos != std::string::npos)
+        filename = uri.substr(pos + 7, std::string::npos);
+    else
+        // Anything other than a file, for now claim that the type
+        // is both audio and video.
+        // FIXME: implement true net stream sampling and get the type from GstCaps
+        return std::string("audio/video/");
+
+
+    GError *error = nullptr;
+    std::unique_ptr<GFile, void(*)(void *)> file(
+            g_file_new_for_path(filename.c_str()), g_object_unref);
+    std::unique_ptr<GFileInfo, void(*)(void *)> info(
+            g_file_query_info(
+                file.get(), G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE ","
+                G_FILE_ATTRIBUTE_ETAG_VALUE, G_FILE_QUERY_INFO_NONE,
+                /* cancellable */ NULL, &error),
+            g_object_unref);
+    if (!info)
+    {
+        std::string error_str(error->message);
+        g_error_free(error);
+
+        std::cout << "Failed to query the URI for the presence of video content: "
+            << error_str << std::endl;
+        return std::string();
+    }
+
+    std::string content_type(g_file_info_get_attribute_string(
+                info.get(), G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE));
+
+    return content_type;
+}
+
+bool gstreamer::Playbin::is_audio_file(const std::string& uri) const
+{
+    if (uri.empty())
+        return false;
+
+    if (get_file_content_type(uri).find("audio/") == 0)
+    {
+        std::cout << "Found audio content" << std::endl;
+        return true;
+    }
+
+    return false;
+}
+
+bool gstreamer::Playbin::is_video_file(const std::string& uri) const
+{
+    if (uri.empty())
+        return false;
+
+    if (get_file_content_type(uri).find("video/") == 0)
+    {
+        std::cout << "Found video content" << std::endl;
+        return true;
+    }
+
+    return false;
+}
+
+gstreamer::Playbin::MediaFileType gstreamer::Playbin::media_file_type() const
+{
+    return file_type;
+}

=== modified file 'src/core/media/gstreamer/playbin.h'
--- src/core/media/gstreamer/playbin.h	2015-03-12 11:42:10 +0000
+++ src/core/media/gstreamer/playbin.h	2015-03-12 11:42:10 +0000
@@ -19,12 +19,11 @@
 #ifndef GSTREAMER_PLAYBIN_H_
 #define GSTREAMER_PLAYBIN_H_
 
+#include <core/media/player.h>
+
 #include "bus.h"
 #include "../mpris/player.h"
 
-#include <hybris/media/surface_texture_client_hybris.h>
-#include <hybris/media/media_codec_layer.h>
-
 #include <gio/gio.h>
 #include <gst/gst.h>
 
@@ -37,8 +36,6 @@
 // other image format, use: dot pipeline.dot -Tpng -o pipeline.png
 //#define DEBUG_GST_PIPELINE
 
-namespace media = core::ubuntu::media;
-
 namespace gstreamer
 {
 struct Playbin
@@ -57,508 +54,66 @@
         MEDIA_FILE_TYPE_VIDEO
     };
 
-    static const std::string& pipeline_name()
-    {
-        static const std::string s{"playbin"};
-        return s;
-    }
-
-    static void about_to_finish(GstElement*,
-                                gpointer user_data)
-    {
-        auto thiz = static_cast<Playbin*>(user_data);
-        thiz->signals.about_to_finish();
-    }
+    static std::string get_audio_role_str(core::ubuntu::media::Player::AudioStreamRole audio_role);
+
+    static const std::string& pipeline_name();
+
+    static void about_to_finish(GstElement*, gpointer user_data);
 
     static void source_setup(GstElement*,
                              GstElement *source,
-                             gpointer user_data)
-    {
-        if (user_data == nullptr)
-            return;
-
-        static_cast<Playbin*>(user_data)->setup_source(source);
-    }
-
-    Playbin()
-        : 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),
-          on_new_message_connection(
-              bus.on_new_message.connect(
-                  std::bind(
-                      &Playbin::on_new_message,
-                      this,
-                      std::placeholders::_1))),
-          is_seeking(false),
-          player_lifetime(media::Player::Lifetime::normal)
-    {
-        if (!pipeline)
-            throw std::runtime_error("Could not create pipeline for playbin.");
-
-        // Add audio and/or video sink elements depending on environment variables
-        // being set or not set
-        setup_pipeline_for_audio_video();
-
-        g_signal_connect(
-                    pipeline,
-                    "about-to-finish",
-                    G_CALLBACK(about_to_finish),
-                    this
-                    );
-
-        g_signal_connect(
-                    pipeline,
-                    "source-setup",
-                    G_CALLBACK(source_setup),
-                    this
-                    );
-
-    }
-
-    ~Playbin()
-    {
-        if (pipeline)
-            gst_object_unref(pipeline);
-    }
-
-    void reset()
-    {
-        std::cout << "Client died, resetting pipeline" << std::endl;
-        // When the client dies, tear down the current pipeline and get it
-        // in a state that is ready for the next client that connects to the
-        // service
-
-        // Don't reset the pipeline if we want to resume
-        if (player_lifetime != media::Player::Lifetime::resumable) {
-            reset_pipeline();
-        }
-
-        // Signal to the Player class that the client side has disconnected
-        signals.client_disconnected();
-    }
-
-    void reset_pipeline()
-    {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
-        auto ret = gst_element_set_state(pipeline, GST_STATE_NULL);
-        switch(ret)
-        {
-        case GST_STATE_CHANGE_FAILURE:
-            std::cout << "Failed to reset the pipeline state. Client reconnect may not function properly." << std::endl;
-            break;
-        case GST_STATE_CHANGE_NO_PREROLL:
-        case GST_STATE_CHANGE_SUCCESS:
-        case GST_STATE_CHANGE_ASYNC:
-            break;
-        default:
-            std::cout << "Failed to reset the pipeline state. Client reconnect may not function properly." << std::endl;
-        }
-        file_type = MEDIA_FILE_TYPE_NONE;
-    }
-
-    void on_new_message(const Bus::Message& message)
-    {
-        switch(message.type)
-        {
-        case GST_MESSAGE_ERROR:
-            signals.on_error(message.detail.error_warning_info);
-            break;
-        case GST_MESSAGE_WARNING:
-            signals.on_warning(message.detail.error_warning_info);
-            break;
-        case GST_MESSAGE_INFO:
-            signals.on_info(message.detail.error_warning_info);
-            break;
-        case GST_MESSAGE_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);
-            break;
-        case GST_MESSAGE_ASYNC_DONE:
-            if (is_seeking)
-            {
-                // FIXME: Pass the actual playback time position to the signal call
-                signals.on_seeked_to(0);
-                is_seeking = false;
-            }
-            break;
-        case GST_MESSAGE_EOS:
-            signals.on_end_of_stream();
-        default:
-            break;
-        }
-    }
-
-    gstreamer::Bus& message_bus()
-    {
-        return bus;
-    }
-
-    void setup_pipeline_for_audio_video()
-    {
-        gint flags;
-        g_object_get (pipeline, "flags", &flags, nullptr);
-        flags |= GST_PLAY_FLAG_AUDIO;
-        flags |= GST_PLAY_FLAG_VIDEO;
-        flags &= ~GST_PLAY_FLAG_TEXT;
-        g_object_set (pipeline, "flags", flags, nullptr);
-
-        if (::getenv("CORE_UBUNTU_MEDIA_SERVICE_AUDIO_SINK_NAME") != nullptr)
-        {
-            auto audio_sink = gst_element_factory_make (
-                        ::getenv("CORE_UBUNTU_MEDIA_SERVICE_AUDIO_SINK_NAME"),
-                        "audio-sink");
-
-            std::cout << "audio_sink: " << ::getenv("CORE_UBUNTU_MEDIA_SERVICE_AUDIO_SINK_NAME") << std::endl;
-
-            g_object_set (
-                        pipeline,
-                        "audio-sink",
-                        audio_sink,
-                        NULL);
-        }
-
-        if (::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME") != nullptr)
-        {
-            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;
-
-            g_object_set (
-                    pipeline,
-                    "video-sink",
-                    video_sink,
-                    NULL);
-        }
-    }
-
-    void create_video_sink(uint32_t texture_id)
-    {
-        std::cout << "Creating video sink for texture_id: " << texture_id << std::endl;
-
-        if (::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME") != nullptr)
-        {
-            g_object_get (pipeline, "video_sink", &video_sink, NULL);
-
-            // Get the service-side BufferQueue (IGraphicBufferProducer) and associate it with
-            // the SurfaceTextureClientHybris instance
-            IGBPWrapperHybris igbp = decoding_service_get_igraphicbufferproducer();
-            SurfaceTextureClientHybris stc = surface_texture_client_create_by_igbp(igbp);
-            // Because mirsink is being loaded, we are definitely doing * hardware rendering.
-            surface_texture_client_set_hardware_rendering (stc, TRUE);
-            g_object_set (G_OBJECT (video_sink), "surface", static_cast<gpointer>(stc), static_cast<char*>(NULL));
-        }
-    }
-
-    void set_volume(double new_volume)
-    {
-        g_object_set (pipeline, "volume", new_volume, NULL);
-    }
-
-    /** Translate the AudioStreamRole enum into a string */
-    static std::string get_audio_role_str(media::Player::AudioStreamRole audio_role)
-    {
-        switch (audio_role)
-        {
-            case media::Player::AudioStreamRole::alarm:
-                return "alarm";
-                break;
-            case media::Player::AudioStreamRole::alert:
-                return "alert";
-                break;
-            case media::Player::AudioStreamRole::multimedia:
-                return "multimedia";
-                break;
-            case media::Player::AudioStreamRole::phone:
-                return "phone";
-                break;
-            default:
-                return "multimedia";
-                break;
-        }
-    }
-
-    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;
-    }
+                             gpointer user_data);
+
+    Playbin();
+    ~Playbin();
+
+    void reset();
+    void reset_pipeline();
+
+    void on_new_message(const Bus::Message& message);
+
+    gstreamer::Bus& message_bus();
+
+    void setup_pipeline_for_audio_video();
+
+    void create_video_sink(uint32_t texture_id);
+
+    void set_volume(double new_volume);
+
+    void set_lifetime(core::ubuntu::media::Player::Lifetime);
+    core::ubuntu::media::Player::Orientation orientation_lut(const gchar *orientation);
 
     /** Sets the new audio stream role on the pulsesink in playbin */
-    void set_audio_stream_role(media::Player::AudioStreamRole new_audio_role)
-    {
-        GstElement *audio_sink = NULL;
-        g_object_get (pipeline, "audio-sink", &audio_sink, NULL);
-
-        std::string role_str("props,media.role=" + get_audio_role_str(new_audio_role));
-        std::cout << "Audio stream role: " << role_str << std::endl;
-
-        GstStructure *props = gst_structure_from_string (role_str.c_str(), NULL);
-        if (audio_sink != nullptr && props != nullptr)
-            g_object_set (audio_sink, "stream-properties", props, NULL);
-        else
-        {
-            std::cerr <<
-                "Warning: couldn't set audio stream role - couldn't get audio_sink from pipeline" <<
-                std::endl;
-        }
-
-        gst_structure_free (props);
-    }
-
-    void set_lifetime(media::Player::Lifetime lifetime)
-    {
-        player_lifetime = lifetime;
-    }
-
-    uint64_t position() const
-    {
-        int64_t pos = 0;
-        gst_element_query_position (pipeline, GST_FORMAT_TIME, &pos);
-
-        // FIXME: this should be int64_t, but dbus-cpp doesn't seem to handle it correctly
-        return static_cast<uint64_t>(pos);
-    }
-
-    uint64_t duration() const
-    {
-        int64_t dur = 0;
-        gst_element_query_duration (pipeline, GST_FORMAT_TIME, &dur);
-
-        // FIXME: this should be int64_t, but dbus-cpp doesn't seem to handle it correctly
-        return static_cast<uint64_t>(dur);
-    }
-
-    void set_uri(const std::string& uri,
-                  const core::ubuntu::media::Player::HeadersType& headers = core::ubuntu::media::Player::HeadersType())
-    {
-       reset_pipeline();
-
-        g_object_set(pipeline, "uri", uri.c_str(), NULL);
-        if (is_video_file(uri))
-            file_type = MEDIA_FILE_TYPE_VIDEO;
-        else if (is_audio_file(uri))
-            file_type = MEDIA_FILE_TYPE_AUDIO;
-
-        request_headers = headers;
-    }
-
-    void setup_source(GstElement *source)
-    {
-        if (source == NULL || request_headers.empty())
-          return;
-
-        if (request_headers.find("Cookie") != request_headers.end()) {
-            if (g_object_class_find_property(G_OBJECT_GET_CLASS(source),
-                                             "cookies") != NULL) {
-                gchar ** cookies = g_strsplit(request_headers["Cookie"].c_str(), ";", 0);
-                g_object_set(source, "cookies", cookies, NULL);
-                g_strfreev(cookies);
-            }
-        }
-
-        if (request_headers.find("User-Agent") != request_headers.end()) {
-            if (g_object_class_find_property(G_OBJECT_GET_CLASS(source),
-                                             "user-agent") != NULL) {
-                g_object_set(source, "user-agent", request_headers["User-Agent"].c_str(), NULL);
-            }
-        }
-    }
-
-    std::string uri() const
-    {
-        gchar* data = nullptr;
-        g_object_get(pipeline, "current-uri", &data, nullptr);
-
-        std::string result((data == nullptr ? "" : data));
-        g_free(data);
-
-        return result;
-    }
-
-    bool set_state_and_wait(GstState new_state)
-    {
-        static const std::chrono::nanoseconds state_change_timeout
-        {
-            // We choose a quite high value here as tests are run under valgrind
-            // and gstreamer pipeline setup/state changes take longer in that scenario.
-            // The value does not negatively impact runtime performance.
-            std::chrono::milliseconds{5000}
-        };
-
-        auto ret = gst_element_set_state(pipeline, new_state);
-        bool result = false; GstState current, pending;
-        switch(ret)
-        {
-        case GST_STATE_CHANGE_FAILURE:
-            result = false; break;
-        case GST_STATE_CHANGE_NO_PREROLL:
-        case GST_STATE_CHANGE_SUCCESS:
-            result = true; break;
-        case GST_STATE_CHANGE_ASYNC:
-            result = GST_STATE_CHANGE_SUCCESS == gst_element_get_state(
-                        pipeline,
-                        &current,
-                        &pending,
-                        state_change_timeout.count());        
-            break;
-        }
-
-        // The state change has to have been successful to make
-        // sure that we indeed reached the requested new state.
-        if (result && new_state == GST_STATE_PLAYING)
-        {
-            // Get the video height/width from the video sink
-            if (has_video_sink_with_height_and_width())
-                signals.on_video_dimensions_changed(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
-        }
-
-        return result;
-    }
-
-    bool seek(const std::chrono::microseconds& ms)
-    {
-        is_seeking = true;
-        return gst_element_seek_simple(
-                    pipeline,
-                    GST_FORMAT_TIME,
-                    (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT),
-                    ms.count() * 1000);
-    }
-
-    bool has_video_sink_with_height_and_width()
-    {
-        return video_sink != nullptr && g_strcmp0(::getenv("CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME"), "mirsink") == 0;
-    }
-
-    core::ubuntu::media::video::Dimensions get_video_dimensions()
-    {
-        if (not has_video_sink_with_height_and_width())
-            throw std::runtime_error{"Could not get the height/width of each video frame"};
-
-        uint32_t video_height = 0, video_width = 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;
-
-        return core::ubuntu::media::video::Dimensions
-        {
-            core::ubuntu::media::video::Height{video_height},
-            core::ubuntu::media::video::Width{video_width}
-        };
-    }
-
-    std::string get_file_content_type(const std::string& uri) const
-    {
-        if (uri.empty())
-            return std::string();
-
-        std::string filename(uri);
-        std::cout << "filename: " << filename << std::endl;
-        size_t pos = uri.find("file://");
-        if (pos != std::string::npos)
-            filename = uri.substr(pos + 7, std::string::npos);
-        else
-            // Anything other than a file, for now claim that the type
-            // is both audio and video.
-            // FIXME: implement true net stream sampling and get the type from GstCaps
-            return std::string("audio/video/");
-
-
-        GError *error = nullptr;
-        std::unique_ptr<GFile, void(*)(void *)> file(
-                g_file_new_for_path(filename.c_str()), g_object_unref);
-        std::unique_ptr<GFileInfo, void(*)(void *)> info(
-                g_file_query_info(
-                    file.get(), G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE ","
-                    G_FILE_ATTRIBUTE_ETAG_VALUE, G_FILE_QUERY_INFO_NONE,
-                    /* cancellable */ NULL, &error),
-                g_object_unref);
-        if (!info)
-        {
-            std::string error_str(error->message);
-            g_error_free(error);
-
-            std::cout << "Failed to query the URI for the presence of video content: "
-                << error_str << std::endl;
-            return std::string();
-        }
-
-        std::string content_type(g_file_info_get_attribute_string(
-                    info.get(), G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE));
-
-        return content_type;
-    }
-
-    bool is_audio_file(const std::string& uri) const
-    {
-        if (uri.empty())
-            return false;
-
-        if (get_file_content_type(uri).find("audio/") == 0)
-        {
-            std::cout << "Found audio content" << std::endl;
-            return true;
-        }
-
-        return false;
-    }
-
-    bool is_video_file(const std::string& uri) const
-    {
-        if (uri.empty())
-            return false;
-
-        if (get_file_content_type(uri).find("video/") == 0)
-        {
-            std::cout << "Found video content" << std::endl;
-            return true;
-        }
-
-        return false;
-    }
-
-    MediaFileType media_file_type() const
-    {
-        return file_type;
-    }
+    void set_audio_stream_role(core::ubuntu::media::Player::AudioStreamRole new_audio_role);
+
+    uint64_t position() const;
+    uint64_t duration() const;
+
+    void set_uri(const std::string& uri, const core::ubuntu::media::Player::HeadersType& headers);
+    std::string uri() const;
+
+    void setup_source(GstElement *source);
+
+    bool set_state_and_wait(GstState new_state);
+    bool seek(const std::chrono::microseconds& ms);
+
+    core::ubuntu::media::video::Dimensions get_video_dimensions() const;
+
+    std::string get_file_content_type(const std::string& uri) const;
+
+    bool is_audio_file(const std::string& uri) const;
+    bool is_video_file(const std::string& uri) const;
+
+    MediaFileType media_file_type() const;
 
     GstElement* pipeline;
     gstreamer::Bus bus;
     MediaFileType file_type;
-    SurfaceTextureClientHybris stc_hybris;
     GstElement* video_sink;
     core::Connection on_new_message_connection;
     bool is_seeking;
     core::ubuntu::media::Player::HeadersType request_headers;
-    media::Player::Lifetime player_lifetime;
+    core::ubuntu::media::Player::Lifetime player_lifetime;
     struct
     {
         core::Signal<void> about_to_finish;