Changeset bc650c59ca6d2edbf555dc0cec11091f274b42f5

Timestamp:

15/09/07 21:14:11 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1189883651 +0000

git-parent:

[d5f7a3c170acf5e7a565f552220a6185cd29db10]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1189883651 +0000

Message:

Rework SDP API a little

Files:

• include/vlc_sout.h (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (5 diffs)
• src/libvlc.sym (modified) (1 diff)
• src/stream_output/sdp.c (modified) (2 diffs)

include/vlc_sout.h

@@ -223 +223 @@
-/** SDP */
-
+VLC_EXPORT( char *, vlc_sdp_Start, ( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) );
-VLC_EXPORT( char *, sdp_Start, (const char *name, const char *description, const char *url, const char *email, const char *phone, const struct sockaddr *orig, size_t origlen, const struct sockaddr *addr, size_t addrlen) );
-VLC_EXPORT( char *, sdp_AddMedia, (char **sdp, const char *type, const char *protocol, int dport, unsigned pt, vlc_bool_t bw_indep, unsigned bw, const char *rtpmap, const char *fmtp) );

modules/stream_out/rtp.c

@@ -70 +70 @@
-    "This is the name of the session that will be announced in the SDP " \
-    "(Session Descriptor)." )
-o
+p
-#define DESC_LONGTEXT N_( \
-broader description of the stream, that will
-
+short description with details about the stream,
+that will 
-#define URL_TEXT N_("Session URL")
-#define URL_LONGTEXT N_( \
@@ -81 +81 @@
-#define EMAIL_TEXT N_("Session email")
-#define EMAIL_LONGTEXT N_( \
-
-
+
+
+
+
+
+
+
-#define PORT_TEXT N_("Port")
-#define PORT_LONGTEXT N_( \
@@ -142 +147 @@
-    add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT,
-                EMAIL_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT,
+                PHONE_LONGTEXT, VLC_TRUE );
-
-    add_integer( SOUT_CFG_PREFIX "port", 1234, NULL, PORT_TEXT,
@@ -171 +178 @@
-static const char *ppsz_sout_options[] = {
-    "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux",
-
+ "phone",
-    "dccp", "tcp", "udplite",
-    "mp4a-latm", NULL
@@ -687 +694 @@
-    }
-
-
-
-
-
+
+
-    if( psz_sdp == NULL )
-        return NULL;
-
-
-    /* TODO: a=source-filter */

src/libvlc.sym

@@ -258 +258 @@
-resolve_xml_special_chars
-secstotimestr
-
+vlc_
-sdp_AddAttribute
-sdp_AddMedia

src/stream_output/sdp.c

@@ -88 +88 @@
-
-char *sdp_Start (const char *name, const char *description, const char *url,
-
-
-
+ 
+ 
+ 
-{
-    uint64_t now = NTPtime64 ();
@@ -245 +245 @@
-    return newsdp;
-}
+
+
+char *vlc_sdp_Start (vlc_object_t *obj, const char *cfgpref,
+                     const struct sockaddr *src, size_t srclen,
+                     const struct sockaddr *addr, size_t addrlen)
+{
+    size_t cfglen = strlen (cfgpref);
+    if (cfglen > 100)
+        return NULL;
+
+    char varname[cfglen + sizeof ("description")], *subvar = varname + cfglen;
+    strcpy (varname, cfgpref);
+
+    session_descriptor_t *p_session = calloc (1, sizeof (*p_session));
+    if (p_session == NULL)
+        return NULL;
+
+    strcpy (subvar, "name");
+    char *name = var_GetNonEmptyString (obj, varname);
+    strcpy (subvar, "description");
+    char *description = var_GetNonEmptyString (obj, varname);
+    strcpy (subvar, "url");
+    char *url = var_GetNonEmptyString (obj, varname);
+    strcpy (subvar, "email");
+    char *email = var_GetNonEmptyString (obj, varname);
+    strcpy (subvar, "phone");
+    char *phone = var_GetNonEmptyString (obj, varname);
+#if 0
+    strcpy (subvar, "group");
+    char *group = var_GetNonEmptyString (obj, varname);
+#endif
+
+    char *sdp = sdp_Start (name, description, url, email, phone,
+                           src, srclen, addr, addrlen);
+    free (name);
+    free (description);
+    free (url);
+    free (email);
+    free (phone);
+
+    return sdp;
+}