Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / src / stream_output / sdp.c

diff --git a/src/stream_output/sdp.c b/src/stream_output/sdp.c
index 76afb569a253b0b33ce2d97756db56c437e15818..ff33bbec512b3ecb5d23c71ffb3dee484bd5f04a 100644 (file)
--- a/src/stream_output/sdp.c
+++ b/src/stream_output/sdp.c
@@ -19,8 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 
+#include <stddef.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -74,18 +79,19 @@ char *AddressToSDP (const struct sockaddr *addr, socklen_t addrlen, char *buf)
 }
 
 
-static vlc_bool_t IsSDPString (const char *str)
+static bool IsSDPString (const char *str)
 {
     if (strchr (str, '\r') != NULL)
-        return VLC_FALSE;
+        return false;
     if (strchr (str, '\n') != NULL)
-        return VLC_FALSE;
+        return false;
     if (!IsUTF8 (str))
-        return VLC_FALSE;
-    return VLC_TRUE;
+        return false;
+    return true;
 }
 
 
+static
 char *sdp_Start (const char *name, const char *description, const char *url,
                  const char *email, const char *phone,
                  const struct sockaddr *src, size_t srclen,
@@ -203,8 +209,9 @@ char *sdp_AddAttribute (char **sdp, const char *name, const char *fmt, ...)
 
 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)
+                    unsigned pt, bool bw_indep, unsigned bw,
+                    const char *ptname, unsigned clock, unsigned chans,
+                    const char *fmtp)
 {
     char *newsdp, *ptr;
     size_t inlen = strlen (*sdp), outlen = inlen;
@@ -236,8 +243,14 @@ char *sdp_AddMedia (char **sdp,
     ptr += sprintf (ptr, "b=RR:0\r\n");
 
     /* RTP payload type map */
-    if (rtpmap != NULL)
-        sdp_AddAttribute (sdp, "rtpmap", "%u %s", pt, rtpmap);
+    if (ptname != NULL)
+    {
+        if ((strcmp (type, "audio") == 0) && (chans != 1))
+            sdp_AddAttribute (sdp, "rtpmap", "%u %s/%u/%u", pt, ptname, clock,
+                              chans);
+        else
+            sdp_AddAttribute (sdp, "rtpmap", "%u %s/%u", pt, ptname, clock);
+    }
     /* Format parameters */
     if (fmtp != NULL)
         sdp_AddAttribute (sdp, "fmtp", "%u %s", pt, fmtp);