Merge lp:~justinmcp/media-hub/fix-allowed-uri-schemes into lp:media-hub/stable

[David Barth]

Allow media-hub to process streams coming via HTTPS urls

Allow media-hub to process streams coming via HTTPS urls

[Jim Hodapp (jhodapp)]

Looks good, thanks.

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

151. By Justin McPherson on 2015-08-18

Add https to allowed URI schemes

150. By CI Train Bot Account on 2015-07-24

Releasing 3.1.0+15.10.20150724-0ubuntu1

149. By Alfonso Sanchez-Beato on 2015-07-24

Set gstreamer context directly instead of using gobject to communicate with the video sink.
Approved by: Jim Hodapp, PS Jenkins bot

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-10 18:12:22 +0000
+++ debian/changelog	2015-08-18 15:19:08 +0000
@@ -1,3 +1,11 @@
+media-hub (3.1.0+15.10.20150724-0ubuntu1) wily; urgency=medium
+
+  [ Alfonso Sanchez-Beato (email Canonical) ]
+  * Set gstreamer context directly instead of using gobject to communicate
+    with the video sink. 
+
+ -- CI Train Bot <[e-mail]>  Fri, 24 Jul 2015 14:54:21 +0000
+
 media-hub (3.1.0+15.10.20150710-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'src/core/media/apparmor/ubuntu.cpp'
--- src/core/media/apparmor/ubuntu.cpp	2014-11-26 16:23:19 +0000
+++ src/core/media/apparmor/ubuntu.cpp	2015-08-18 15:19:08 +0000
@@ -177,7 +177,9 @@
     {
         return Result{true, "Client can access content in /usr/share/sounds"};
     }
-    else if (parsed_uri.scheme == "http" || parsed_uri.scheme == "rtsp")
+    else if (parsed_uri.scheme == "http" ||
+             parsed_uri.scheme == "https" ||
+             parsed_uri.scheme == "rtsp")
     {
         return Result{true, "Client can access streaming content"};
     }

=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2015-06-12 18:14:05 +0000
+++ src/core/media/gstreamer/playbin.cpp	2015-08-18 15:19:08 +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
@@ -268,7 +275,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)