#include <vlc_codecs.h>
#include "rtp.h"
+#include <srtp.h>
#define RTP_CACHING_TEXT N_("RTP de-jitter buffer length (msec)")
#define RTP_CACHING_LONGTEXT N_( \
"How long to wait for late RTP packets (and delay the performance)." )
+#define SRTP_KEY_TEXT N_("SRTP key (hexadecimal)")
+#define SRTP_KEY_LONGTEXT N_( \
+ "RTP packets will be authenticated and deciphered "\
+ "with this Secure RTP master shared secret key.")
+
+#define SRTP_SALT_TEXT N_("SRTP salt (hexadecimal)")
+#define SRTP_SALT_LONGTEXT N_( \
+ "Secure RTP requires a (non-secret) master salt value.")
+
#define RTP_MAX_SRC_TEXT N_("Maximum RTP sources")
#define RTP_MAX_SRC_LONGTEXT N_( \
"How many distinct active RTP sources are allowed at a time." )
set_description (_("(Experimental) Real-Time Protocol demuxer"));
set_category (CAT_INPUT);
set_subcategory (SUBCAT_INPUT_DEMUX);
- set_capability ("access_demux", 10);
+ set_capability ("access_demux", 0);
set_callbacks (Open, Close);
add_integer ("rtp-caching", 1000, NULL, RTP_CACHING_TEXT,
RTP_CACHING_LONGTEXT, true);
change_integer_range (0, 65535);
+ add_string ("srtp-key", "", NULL,
+ SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false);
+ add_string ("srtp-salt", "", NULL,
+ SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false);
add_integer ("rtp-max-src", 1, NULL, RTP_MAX_SRC_TEXT,
RTP_MAX_SRC_LONGTEXT, true);
change_integer_range (1, 255);
dport = 5004; /* avt-profile-1 port */
/* Try to connect */
- int fd = -1;
+ int fd = -1, rtcp_fd = -1;
switch (tp)
{
case IPPROTO_UDP:
case IPPROTO_UDPLITE:
- fd = net_OpenDgram (obj, dhost, dport, shost, sport, AF_UNSPEC,
- tp);
+ fd = net_OpenDgram (obj, dhost, (dport + 1) & ~1,
+ shost, (sport + 1) & ~1, AF_UNSPEC, tp);
+ if (fd == -1)
+ break;
+ rtcp_fd = net_OpenDgram (obj, dhost, dport | 1, shost,
+ sport ? (sport | 1) : 0, AF_UNSPEC, tp);
break;
case IPPROTO_DCCP:
#endif
#ifdef SOCK_DCCP
var_Create (obj, "dccp-service", VLC_VAR_STRING);
- var_SetString (obj, "dccp-service", "RTPV");
- fd = net_Connect (obj, shost, sport, SOCK_DCCP, tp);
+ var_SetString (obj, "dccp-service", "RTPV"); /* FIXME: RTPA? */
+ fd = net_Connect (obj, shost, (sport + 1) & ~1, SOCK_DCCP, tp);
#else
msg_Err (obj, "DCCP support not included");
#endif
break;
case IPPROTO_TCP:
- fd = net_Connect (obj, shost, sport, SOCK_STREAM, tp);
+ fd = net_Connect (obj, shost, (sport + 1) & ~1, SOCK_STREAM, tp);
break;
}
/* Initializes demux */
demux_sys_t *p_sys = malloc (sizeof (*p_sys));
if (p_sys == NULL)
- goto error;
+ {
+ net_Close (fd);
+ if (rtcp_fd != -1)
+ net_Close (rtcp_fd);
+ return VLC_EGENERIC;
+ }
+ p_sys->srtp = NULL;
+ p_sys->fd = fd;
+ p_sys->rtcp_fd = rtcp_fd;
p_sys->caching = var_CreateGetInteger (obj, "rtp-caching");
p_sys->max_src = var_CreateGetInteger (obj, "rtp-max-src");
p_sys->timeout = var_CreateGetInteger (obj, "rtp-timeout");
if (p_sys->session == NULL)
goto error;
- p_sys->fd = fd;
+ char *key = var_CreateGetNonEmptyString (demux, "srtp-key");
+ if (key)
+ {
+ p_sys->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10,
+ SRTP_PRF_AES_CM, SRTP_RCC_MODE1);
+ if (p_sys->srtp == NULL)
+ {
+ free (key);
+ goto error;
+ }
+
+ char *salt = var_CreateGetNonEmptyString (demux, "srtp-salt");
+ errno = srtp_setkeystring (p_sys->srtp, key, salt ? salt : "");
+ free (salt);
+ free (key);
+ if (errno)
+ {
+ msg_Err (obj, "bad SRTP key/salt combination (%m)");
+ goto error;
+ }
+ }
+
return VLC_SUCCESS;
error:
- net_Close (fd);
- free (p_sys);
+ Close (obj);
return VLC_EGENERIC;
}
demux_t *demux = (demux_t *)obj;
demux_sys_t *p_sys = demux->p_sys;
- rtp_session_destroy (demux, p_sys->session);
+ if (p_sys->srtp)
+ srtp_destroy (p_sys->srtp);
+ if (p_sys->session)
+ rtp_session_destroy (demux, p_sys->session);
+ if (p_sys->rtcp_fd != -1)
+ net_Close (p_sys->rtcp_fd);
net_Close (p_sys->fd);
free (p_sys);
}
if (host[0] == '[')
{
- host = *++phost; /* skip '[' */
+ host = ++*phost; /* skip '[' */
port = strchr (host, ']');
if (port)
*port++ = '\0'; /* skip ']' */
{
float *v = va_arg (args, float *);
*v = 0.;
- return 0;
+ return VLC_SUCCESS;
}
case DEMUX_GET_LENGTH:
{
int64_t *v = va_arg (args, int64_t *);
*v = 0;
- return 0;
+ return VLC_SUCCESS;
}
case DEMUX_GET_PTS_DELAY:
{
int64_t *v = va_arg (args, int64_t *);
- *v = p_sys->caching;
- return 0;
+ *v = p_sys->caching * 1000;
+ return VLC_SUCCESS;
+ }
+
+ case DEMUX_CAN_PAUSE:
+ case DEMUX_CAN_SEEK:
+ case DEMUX_CAN_CONTROL_PACE:
+ {
+ bool *v = (bool*)va_arg( args, bool * );
+ *v = false;
+ return VLC_SUCCESS;
}
}
len = net_Read (VLC_OBJECT (demux), fd, NULL,
block->p_buffer, block->i_buffer, false);
if (((len <= 0) && fd_dead (fd))
- || demux->b_die)
+ || !vlc_object_alive (demux))
{
block_Release (block);
return NULL;
if (data)
{
block->i_dts = 0; /* RTP does not specify this */
- es_out_Control (demux->out, ES_OUT_SET_PCR,
- block->i_pts - demux->p_sys->caching * 1000);
+ es_out_Control (demux->out, ES_OUT_SET_PCR, block->i_pts );
es_out_Send (demux->out, (es_out_id_t *)data, block);
}
else
*/
static void *ts_init (demux_t *demux)
{
- return stream_init (demux, "ts");
+ return stream_init (demux, *demux->psz_demux ? demux->psz_demux : "ts");
}
if (ptype >= 72 && ptype <= 76)
goto drop; /* Muxed RTCP, ignore for now */
+ if (p_sys->srtp)
+ {
+ size_t len = block->i_buffer;
+ if (srtp_recv (p_sys->srtp, block->p_buffer, &len))
+ {
+ msg_Dbg (demux, "SRTP authentication/decryption failed");
+ goto drop;
+ }
+ block->i_buffer = len;
+ }
+
/* Not using SDP, we need to guess the payload format used */
/* see http://www.iana.org/assignments/rtp-parameters */
if (p_sys->autodetect)
msg_Dbg (demux, "detected MPEG Audio");
pt.init = mpa_init;
pt.decode = mpa_decode;
- pt.frequency = 44100;
+ pt.frequency = 90000;
break;
case 32:
projects / vlc / blobdiff