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

[Alfonso Sanchez-Beato]

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

[Jim Hodapp (jhodapp)]

Looks good, thanks!

review: Approve (code)

=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2015-11-17 10:03:46 +0000
+++ src/core/media/gstreamer/playbin.cpp	2015-12-07 08:13:06 +0000
@@ -30,15 +30,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
@@ -46,7 +53,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
@@ -346,7 +353,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)