* 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>
}
-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;
}
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;
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);