media: add optional context for bus messages

Add an optional mainloop to _prepare that will handle the bus messages instead
of always using the shared mainloop.

diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
index a597916227d9714b6dc7917982e8c064188bcb1b..47956e5583afe3ee9a2c972b82a62c03c18744de 100644 (file)
--- a/gst/rtsp-server/rtsp-client.c
+++ b/gst/rtsp-server/rtsp-client.c
@@ -522,7 +522,7 @@ find_media (GstRTSPClient * client, GstRTSPClientState * state, gint * matched)
       goto no_media;
 
     /* prepare the media */
-    if (!(gst_rtsp_media_prepare (media)))
+    if (!(gst_rtsp_media_prepare (media, NULL)))
       goto no_prepare;
 
     /* now keep track of the uri and the media */

diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index 4e25e1584fc046cc3374e17d5e05d79234b3724b..2a875b37f96c2d703b0c0d278291b1de42442442 100644 (file)
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -1507,6 +1507,7 @@ struct _DynPaySignalHandlers
 /**
  * gst_rtsp_media_prepare:
  * @media: a #GstRTSPMedia
+ * @context: a #GMainContext to run the bus handler or %NULL
  *
  * Prepare @media for streaming. This function will create the objects
  * to manage the streaming. A pipeline must have been set on @media with
@@ -1518,7 +1519,7 @@ struct _DynPaySignalHandlers
  * Returns: %TRUE on success.
  */
 gboolean
-gst_rtsp_media_prepare (GstRTSPMedia * media)
+gst_rtsp_media_prepare (GstRTSPMedia * media, GMainContext * context)
 {
   GstRTSPMediaPrivate *priv;
   GstStateChangeReturn ret;
@@ -1570,7 +1571,7 @@ gst_rtsp_media_prepare (GstRTSPMedia * media)
       g_object_ref (media), (GDestroyNotify) watch_destroyed);
 
   klass = GST_RTSP_MEDIA_GET_CLASS (media);
-  priv->id = g_source_attach (priv->source, klass->context);
+  priv->id = g_source_attach (priv->source, context ? context : klass->context);
 
   /* add stuff to the bin */
   gst_bin_add (GST_BIN (priv->pipeline), priv->rtpbin);

diff --git a/gst/rtsp-server/rtsp-media.h b/gst/rtsp-server/rtsp-media.h
index 02be092c7e44a1020a633c51b60b02a29d9e5816..f76a6ddcd5795c6bc53316209fc83a34f85253be 100644 (file)
--- a/gst/rtsp-server/rtsp-media.h
+++ b/gst/rtsp-server/rtsp-media.h
@@ -149,7 +149,7 @@ GstNetTimeProvider *  gst_rtsp_media_get_time_provider (GstRTSPMedia *media,
                                                         const gchar *address, guint16 port);
 
 /* prepare the media for playback */
-gboolean              gst_rtsp_media_prepare          (GstRTSPMedia *media);
+gboolean              gst_rtsp_media_prepare          (GstRTSPMedia *media, GMainContext *context);
 gboolean              gst_rtsp_media_unprepare        (GstRTSPMedia *media);
 
 /* creating streams */

diff --git a/tests/check/gst/media.c b/tests/check/gst/media.c
index dd814cfec8996f3f3df6ae6a21e9a77b2f7ea181..0692bcb38275231605213704bd9a2f17d0a77cf5 100644 (file)
--- a/tests/check/gst/media.c
+++ b/tests/check/gst/media.c
@@ -53,7 +53,7 @@ GST_START_TEST (test_launch)
   /* fails, need to be prepared */
   fail_if (gst_rtsp_media_seek (media, range));
 
-  fail_unless (gst_rtsp_media_prepare (media));
+  fail_unless (gst_rtsp_media_prepare (media, NULL));
 
   str = gst_rtsp_media_get_range_string (media, FALSE, GST_RTSP_RANGE_NPT);
   fail_unless (g_str_equal (str, "npt=0-"));
@@ -132,10 +132,10 @@ GST_START_TEST (test_media_prepare)
   fail_unless (GST_IS_RTSP_MEDIA (media));
   fail_unless (gst_rtsp_media_n_streams (media) == 1);
 
-  fail_unless (gst_rtsp_media_prepare (media));
+  fail_unless (gst_rtsp_media_prepare (media, NULL));
   fail_unless (gst_rtsp_media_unprepare (media));
   fail_unless (gst_rtsp_media_n_streams (media) == 1);
-  fail_if (gst_rtsp_media_prepare (media));
+  fail_if (gst_rtsp_media_prepare (media, NULL));
 
   g_object_unref (media);
   gst_rtsp_url_free (url);
@@ -155,10 +155,10 @@ GST_START_TEST (test_media_prepare)
 
   g_object_set (G_OBJECT (media), "reusable", TRUE, NULL);
 
-  fail_unless (gst_rtsp_media_prepare (media));
+  fail_unless (gst_rtsp_media_prepare (media, NULL));
   fail_unless (gst_rtsp_media_unprepare (media));
   fail_unless (gst_rtsp_media_n_streams (media) == 1);
-  fail_unless (gst_rtsp_media_prepare (media));
+  fail_unless (gst_rtsp_media_prepare (media, NULL));
   fail_unless (gst_rtsp_media_unprepare (media));
 
   g_object_unref (media);
@@ -220,13 +220,13 @@ GST_START_TEST (test_media_dyn_prepare)
   g_signal_connect (srcpad, "notify::caps", (GCallback) on_notify_caps, pay);
 
   fail_unless (gst_rtsp_media_n_streams (media) == 0);
-  fail_unless (gst_rtsp_media_prepare (media));
+  fail_unless (gst_rtsp_media_prepare (media, NULL));
   fail_unless (gst_rtsp_media_n_streams (media) == 1);
   fail_unless (gst_rtsp_media_unprepare (media));
   fail_unless (gst_rtsp_media_n_streams (media) == 0);
 
   fail_unless (gst_rtsp_media_n_streams (media) == 0);
-  fail_unless (gst_rtsp_media_prepare (media));
+  fail_unless (gst_rtsp_media_prepare (media, NULL));
   fail_unless (gst_rtsp_media_n_streams (media) == 1);
   fail_unless (gst_rtsp_media_unprepare (media));
   fail_unless (gst_rtsp_media_n_streams (media) == 0);