* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_block.h>
#include <vlc_network.h>
-
-
-#include <vlc_url.h>
#include <vlc_sout.h>
#include "rtp.h"
};
-rtcp_sender_t *OpenRTCP (vlc_object_t *obj, int rtp_fd, int proto)
+rtcp_sender_t *OpenRTCP (vlc_object_t *obj, int rtp_fd, int proto,
+ vlc_bool_t mux)
{
rtcp_sender_t *rtcp;
uint8_t *ptr;
- char src[NI_MAXNUMERICHOST], dst[NI_MAXNUMERICHOST];
- int sport, dport;
int fd;
+ char src[NI_MAXNUMERICHOST];
+ int sport;
- if (net_GetSockAddress (rtp_fd, src, &sport)
- || net_GetPeerAddress (rtp_fd, dst, &dport))
+ if (net_GetSockAddress (rtp_fd, src, &sport))
return NULL;
- sport++;
- dport++;
+ if (mux)
+ {
+ /* RTP/RTCP mux: duplicate the socket */
+#ifndef WIN32
+ fd = dup (rtp_fd);
+#else
+ WSAPROTOCOL_INFO info;
+ WSADuplicateSocket (rtp_fd, GetCurrentProcessId (), &info);
+ fd = WSASocket (info.iAddressFamily, info.iSocketType, info.iProtocol,
+ &info, 0, 0);
+#endif
+ }
+ else
+ {
+ /* RTCP on a separate port */
+ char dst[NI_MAXNUMERICHOST];
+ int dport;
+
+ if (net_GetPeerAddress (rtp_fd, dst, &dport))
+ return NULL;
+
+ sport++;
+ dport++;
+
+ fd = net_OpenDgram (obj, src, sport, dst, dport, AF_UNSPEC, proto);
+ }
- fd = net_OpenDgram (obj, src, sport, dst, dport, AF_UNSPEC, proto);
if (fd == -1)
return NULL;
while ((ptr - sdes) & 3) /* 32-bits padding */
*ptr++ = 0;
- SetWBE (lenptr, ptr - sdes);
+ SetWBE (lenptr, (ptr - sdes - 1) >> 2);
rtcp->length = ptr - rtcp->payload;
return rtcp;