Merge lp:~phablet-team/media-hub/gst-1.5 into lp:media-hub

[Jim Hodapp]

Set gstreamer context directly instead of using gobject to communicate with the video sink.

Set gstreamer context directly instead of using gobject to communicate with the video sink.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Just one thing to fix.

review: Needs Fixing (code)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See comment below.

[Jim Hodapp (jhodapp)]

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-04 14:18:22 +0000
+++ debian/changelog	2015-07-21 16:26:24 +0000
@@ -1,3 +1,10 @@
+media-hub (3.1.0+15.10.20150720-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Set gstreamer context directly instead of using gobject to communicate
+    with the video sink. 
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Mon, 20 Jul 2015 18:46:25 +0200
+
 media-hub (3.1.0+15.10.20150604-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2015-06-01 21:34:46 +0000
+++ src/core/media/gstreamer/playbin.cpp	2015-07-21 16:26:24 +0000
@@ -28,15 +28,22 @@
 
 namespace
 {
-void setup_video_sink_for_buffer_streaming(GstElement* video_sink)
+void setup_video_sink_for_buffer_streaming(GstElement* pipeline)
 {
     // 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));
+    surface_texture_client_set_hardware_rendering(stc, TRUE);
+
+    GstContext *context = gst_context_new("gst.mir.MirContext", TRUE);
+    GstStructure *structure = gst_context_writable_structure(context);
+    gst_structure_set(structure, "gst_mir_context", G_TYPE_POINTER, stc, NULL);
+
+    /* Propagate context in pipeline (needed by amchybris and mirsink) */
+    gst_element_set_context(pipeline, context);
 }
 }
 #else  // MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER
@@ -44,7 +51,7 @@
 {
 void setup_video_sink_for_buffer_streaming(GstElement*)
 {
-    throw core::ubuntu::media::Player::Error::OutOfProcessBufferStreamingNotSupported{};
+    throw core::ubuntu::media::Player::Errors::OutOfProcessBufferStreamingNotSupported{};
 }
 }
 #endif // MEDIA_HUB_HAVE_HYBRIS_MEDIA_COMPAT_LAYER
@@ -267,7 +274,7 @@
         "No video sink configured for the current pipeline"
     };
 
-    setup_video_sink_for_buffer_streaming(video_sink);
+    setup_video_sink_for_buffer_streaming(pipeline);
 }
 
 void gstreamer::Playbin::set_volume(double new_volume)