Changeset 60db87243c9426e59557d0f0f2e30276cc2f9c94

Timestamp:

01/05/07 19:14:14 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[7681a9b5d1df0cbcaa5914cc33bb40fee8276a36]

git-author:

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

Message:

Add helper for SDP media description formatting

Files:

• src/stream_output/sdp.c (modified) (3 diffs)
• src/stream_output/stream_output.h (modified) (1 diff)

src/stream_output/sdp.c

@@ -25 +25 @@
-
-#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <assert.h>
-#include <vlc_network.h>
-#include <vlc_charset.h>
@@ -109 +112 @@
-    if (!IsSDPString (name) || !IsSDPString (description)
-     || !IsSDPString (url) || !IsSDPString (email) || !IsSDPString (phone)
-(struct sockaddr *)
-(struct sockaddr *)
+
+
-        return NULL;
-
@@ -150 +153 @@
-}
-
+
+char *MakeSDPMedia (const char *type, int dport, const char *protocol,
+                    unsigned pt, const char *rtpmap, const char *fmtpfmt, ...)
+{
+    char *sdp_media = NULL;
+
+    /* Some default values */
+    if (type == NULL)
+        type = "video";
+    if (dport == 0)
+        dport = 9;
+    if (protocol == NULL)
+        protocol = "RTP/AVP";
+    assert (pt < 128u);
+
+    /* RTP payload type map */
+    char sdp_rtpmap[rtpmap ? (sizeof ("a=rtpmap:123 *\r\n") + strlen (rtpmap)) : 1];
+    if (rtpmap != NULL)
+        sprintf (sdp_rtpmap, "a=rtpmap:%u %s\r\n", pt, rtpmap);
+    else
+        *sdp_rtpmap = '\0';
+
+    /* Format parameters */
+    char *fmtp = NULL;
+    if (fmtpfmt != NULL)
+    {
+        va_list ap;
+
+        va_start (ap, fmtpfmt);
+        if (vasprintf (&fmtp, fmtpfmt, ap) == -1)
+            fmtpfmt = NULL;
+        va_end (ap);
+
+        if (fmtp == NULL)
+            return NULL;
+    }
+
+    char sdp_fmtp[fmtp ? (sizeof ("a=fmtp:123 *\r\n") + strlen (fmtp)) : 1];
+    if (fmtp != NULL)
+    {
+        sprintf (sdp_fmtp, "a=fmtp:%u %s\r\n", pt, fmtp);
+        free (fmtp);
+    }
+    else
+        *sdp_fmtp = '\0';
+
+    if (asprintf (&sdp_media, "m=%s %u %s %d\r\n" "%s" "%s",
+                  type, dport, protocol, pt,
+                  sdp_rtpmap, sdp_fmtp) == -1)
+        return NULL;
+
+    return sdp_media;
+}

src/stream_output/stream_output.h

@@ -117 +117 @@
-                const struct sockaddr *orig, socklen_t origlen,
-                const struct sockaddr *addr, socklen_t addrlen);
+char *MakeSDPMedia (const char *type, int dport, const char *protocol,
+                    unsigned pt, const char *rtpmap, const char *fmtp, ...);
-