Changeset fe63f4c516d7a328fc743a90ec08e1df725376c0

Timestamp:

09/11/07 19:05:09 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[4a7e8ae30ad231844cdb6abfdec00d5c287232e9]

git-author:

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

Message:

Try to improve and export the SDP formatting helpers

Files:

• include/vlc_sout.h (modified) (1 diff)
• src/libvlc.sym (modified) (1 diff)
• src/stream_output/sap.c (modified) (1 diff)
• src/stream_output/sdp.c (modified) (3 diffs)
• src/stream_output/stream_output.h (modified) (1 diff)

include/vlc_sout.h

@@ -221 +221 @@
-VLC_EXPORT(void,                 sout_MethodRelease, (announce_method_t *) );
-
+/** SDP */
+
+VLC_EXPORT( char *, sdp_Start, (const char *name, const char *description, const char *url, const char *email, const char *phone, const struct sockaddr *orig, socklen_t origlen, const struct sockaddr *addr, socklen_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) );
+VLC_EXPORT( char *, sdp_AddAttribute, (char **sdp, const char *name, const char *fmt, ...) );
+
+
-#ifdef __cplusplus
-}

src/libvlc.sym

@@ -256 +256 @@
-resolve_xml_special_chars
-secstotimestr
+sdp_Start
+sdp_AddAttribute
+sdp_AddMedia
-sout_AccessOutDelete
-sout_AccessOutNew

src/stream_output/sap.c

@@ -598 +598 @@
-    char *psz_group, *psz_name, *psz_sdp;
-
-StartSDP
+sdp_Start
-        p_session->url, p_session->email, p_session->phone,
-        (const struct sockaddr *)&p_session->orig, p_session->origlen,

src/stream_output/sdp.c

@@ -87 +87 @@
-
-
-StartSDP
+sdp_Start
-                const char *email, const char *phone,
-                const struct sockaddr *src, socklen_t srclen,
@@ -158 +158 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    char *newsdp, *ptr;
@@ -178 +220 @@
-                        type, dport, protocol, pt);
-
+    newsdp = realloc (*sdp, outlen + 1);
+    if (newsdp == NULL)
+        return NULL;
+
+    *sdp = newsdp;
+    ptr = newsdp + inlen;
+
+    ptr += sprintf (ptr, "m=%s %u %s %d\r\n"
+                         "b=RR:0\r\n",
+                         type, dport, protocol, pt);
+
-    /* RTP payload type map */
-    if (rtpmap != NULL)
-
-
+
-    /* Format parameters */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    return newsdp;
-}
-
-
-char *AddSDPMedia (char **sdp, const char *type, int dport, const char *proto,
-                   unsigned pt, const char *rtpmap, const char *fmtpfmt, ...)
-{
-    va_list ap;
-    char *ret;
-
-    va_start (ap, fmtpfmt);
-    ret = vAddSDPMedia (sdp, type, dport, proto, pt, rtpmap, fmtpfmt, ap);
-    va_end (ap);
-
-    return ret;
-}

src/stream_output/stream_output.h

@@ -116 +116 @@
-void announce_SAPHandlerDestroy( sap_handler_t *p_sap );
-
-#include <stdarg.h>
-
-char *StartSDP (const char *name, const char *description, const char *url,
-                const char *email, const char *phone,
-                const struct sockaddr *orig, socklen_t origlen,
-                const struct sockaddr *addr, socklen_t addrlen);
-
-char *vAddSDPMedia (char **sdp, const char *type, int dport, const char *prot,
-                    unsigned pt, const char *rtpmap,
-                    const char *fmtpfmt, va_list ap);
-char *AddSDPMedia (char **sdp, const char *type, int dport, const char *proto,
-                   unsigned pt, const char *rtpmap, const char *fmtpfmt, ...);
-
-#endif