factory: factor out the stream construction

diff --git a/gst/rtsp-server/rtsp-media-factory.c b/gst/rtsp-server/rtsp-media-factory.c
index 6eb8348..69991ae 100644 (file)
--- a/gst/rtsp-server/rtsp-media-factory.c
+++ b/gst/rtsp-server/rtsp-media-factory.c
@@ -396,49 +396,35 @@ parse_error:
   }
 }
 
-
-static GstRTSPMedia *
-default_construct (GstRTSPMediaFactory *factory, const GstRTSPUrl *url)
+/* try to find all the payloader elements, they should be named 'pay%d'. for
+ * each of the payloaders we will create a stream and collect the source pad. */
+static void
+collect_streams (GstRTSPMediaFactory *factory, const GstRTSPUrl *url,
+    GstRTSPMedia *media)
 {
-  GstRTSPMedia *media;
-  GstRTSPMediaStream *stream;
-  GstElement *pay, *element;
+  GstElement *element, *pay;
   GstPad * pad;
   gint i;
-  GstRTSPMediaFactoryClass *klass;
-
-  klass = GST_RTSP_MEDIA_FACTORY_GET_CLASS (factory);
-
-  if (klass->get_element)
-    element = klass->get_element (factory, url);
-  else
-    element = NULL;
-  if (element == NULL)
-    goto no_element;
+  GstRTSPMediaStream *stream;
 
-  /* create a new empty media */
-  media = gst_rtsp_media_new ();
-  media->element = element;
+  element = media->element;
 
-  /* try to find all the payloader elements, they should be named 'pay%d'. for
-   * each of the payloaders we will create a stream and collect the source pad.
-   */
   for (i = 0; ; i++) {
     gchar *name;
 
     name = g_strdup_printf ("pay%d", i);
-
     if (!(pay = gst_bin_get_by_name (GST_BIN (element), name))) {
       /* no more payloaders found, we have found all the streams and we can
        * end the loop */
       g_free (name);
       break;
     }
-    
     /* create the stream */
     stream = g_new0 (GstRTSPMediaStream, 1);
     stream->payloader = pay;
 
+    g_message ("found stream %d with payloader %p", i, pay);
+
     pad = gst_element_get_static_pad (pay, "src");
 
     /* ghost the pad of the payloader to the element */
@@ -450,6 +436,29 @@ default_construct (GstRTSPMediaFactory *factory, const GstRTSPUrl *url)
     /* add stream now */
     g_array_append_val (media->streams, stream);
   }
+}
+
+static GstRTSPMedia *
+default_construct (GstRTSPMediaFactory *factory, const GstRTSPUrl *url)
+{
+  GstRTSPMedia *media;
+  GstElement *element;
+  GstRTSPMediaFactoryClass *klass;
+
+  klass = GST_RTSP_MEDIA_FACTORY_GET_CLASS (factory);
+
+  if (klass->get_element)
+    element = klass->get_element (factory, url);
+  else
+    element = NULL;
+  if (element == NULL)
+    goto no_element;
+
+  /* create a new empty media */
+  media = gst_rtsp_media_new ();
+  media->element = element;
+
+  collect_streams (factory, url, media);
 
   return media;