#include <vlc_rand.h>
#ifdef HAVE_SRTP
# include <srtp.h>
+# include <gcrypt.h>
+# include <vlc_gcrypt.h>
#endif
#include "rtp.h"
#define SDP_TEXT N_("SDP")
#define SDP_LONGTEXT N_( \
"This allows you to specify how the SDP (Session Descriptor) for this RTP "\
- "session will be made available. You must use an url: http://location to " \
+ "session will be made available. You must use a url: http://location to " \
"access the SDP via HTTP, rtsp://location for RTSP access, and sap:// " \
"for the SDP to be announced via SAP." )
#define SAP_TEXT N_("SAP announcing")
"that will be announced in the SDP (Session Descriptor)." )
#define URL_TEXT N_("Session URL")
#define URL_LONGTEXT N_( \
- "This allows you to give an URL with more details about the stream " \
+ "This allows you to give a URL with more details about the stream " \
"(often the website of the streaming organization), that will " \
"be announced in the SDP (Session Descriptor)." )
#define EMAIL_TEXT N_("Session email")
sout_stream_t *p_stream;
/* rtp field */
uint16_t i_sequence;
+ bool b_first_packet;
bool b_ts_init;
uint32_t i_ts_offset;
uint8_t ssrc[4];
sdp_AddAttribute( &psz_sdp, "setup", "passive" );
if( p_sys->proto == IPPROTO_DCCP )
sdp_AddAttribute( &psz_sdp, "dccp-service-code",
- "SC:RTP%c", toupper( mime_major[0] ) );
+ "SC:RTP%c",
+ toupper( (unsigned char)mime_major[0] ) );
}
}
out:
id->p_fifo = NULL;
id->listen.fd = NULL;
+ id->b_first_packet = true;
id->i_caching =
(int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
}
#ifdef HAVE_SRTP
- char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
+ char *key = var_GetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
if (key)
{
+ vlc_gcrypt_init ();
id->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10,
SRTP_PRF_AES_CM, SRTP_RCC_MODE1);
if (id->srtp == NULL)
goto error;
}
- char *salt = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"salt");
+ char *salt = var_GetNonEmptyString (p_stream, SOUT_CFG_PREFIX"salt");
errno = srtp_setkeystring (id->srtp, key, salt ? salt : "");
free (salt);
free (key);
/* Send a Vorbis/Theora Packed Configuration packet (RFC 5215 ยง3.1)
* as the first packet of the stream */
- if (id->i_sequence == id->i_seq_sent_next
- && (!strcmp(id->rtp_fmt.ptname, "vorbis")
- || !strcmp(id->rtp_fmt.ptname, "theora")))
+ if (id->b_first_packet)
+ {
+ id->b_first_packet = false;
+ if (!strcmp(id->rtp_fmt.ptname, "vorbis") ||
+ !strcmp(id->rtp_fmt.ptname, "theora"))
rtp_packetize_xiph_config(id, id->rtp_fmt.fmtp,
p_buffer->i_pts);
+ }
if( id->rtp_fmt.pf_packetize( id, p_buffer ) )
break;
}
if( p_sys->i_es > 0 && p_sys->psz_sdp && *p_sys->psz_sdp )
- {
- announce_method_t *p_method = sout_SAPMethod();
p_sys->p_session = sout_AnnounceRegisterSDP( p_sout,
p_sys->psz_sdp,
- p_sys->psz_destination,
- p_method );
- sout_MethodRelease( p_method );
- }
+ p_sys->psz_destination );
return VLC_SUCCESS;
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host,
- url->i_port > 0 ? url->i_port : 80 );
+ p_sys->p_httpd_host = vlc_http_HostNew( VLC_OBJECT(p_stream) );
if( p_sys->p_httpd_host )
{
p_sys->p_httpd_file = httpd_FileNew( p_sys->p_httpd_host,
out->i_buffer = len;
}
if (out)
-#endif
mwait (out->i_dts + i_caching);
vlc_cleanup_pop ();
if (out == NULL)
continue;
+#else
+ mwait (out->i_dts + i_caching);
+ vlc_cleanup_pop ();
+#endif
ssize_t len = out->i_buffer;
int canc = vlc_savecancel ();
#endif
SendRTCP( id->sinkv[i].rtcp, out );
- if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 )
- continue;
- switch( net_errno )
+ if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) == -1
+ && net_errno != EAGAIN && net_errno != EWOULDBLOCK
+ && net_errno != ENOBUFS && net_errno != ENOMEM )
{
- /* Soft errors (e.g. ICMP): */
- case ECONNREFUSED: /* Port unreachable */
- case ENOPROTOOPT:
-#ifdef EPROTO
- case EPROTO: /* Protocol unreachable */
-#endif
- case EHOSTUNREACH: /* Host unreachable */
- case ENETUNREACH: /* Network unreachable */
- case ENETDOWN: /* Entire network down */
+ int type;
+ getsockopt( id->sinkv[i].rtp_fd, SOL_SOCKET, SO_TYPE,
+ &type, &(socklen_t){ sizeof(type) });
+ if( type == SOCK_DGRAM )
+ /* ICMP soft error: ignore and retry */
send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 );
- /* Transient congestion: */
- case ENOMEM: /* out of socket buffers */
- case ENOBUFS:
- case EAGAIN:
-#if (EAGAIN != EWOULDBLOCK)
- case EWOULDBLOCK:
-#endif
- continue;
+ else
+ /* Broken connection */
+ deadv[deadc++] = id->sinkv[i].rtp_fd;
}
-
- deadv[deadc++] = id->sinkv[i].rtp_fd;
}
id->i_seq_sent_next = ntohs(((uint16_t *) out->p_buffer)[1]) + 1;
vlc_mutex_unlock( &id->lock_sink );
uint64_t i_ts_init;
/* As per RFC 2326, session identifiers are at least 8 bytes long */
strncpy((char *)&i_ts_init, psz_vod_session, sizeof(uint64_t));
- i_ts_init ^= (uint64_t) p_media;
+ i_ts_init ^= (uintptr_t)p_media;
/* Limit the timestamp to 48 bytes, this is enough and allows us
* to stay away from overflows */
i_ts_init &= 0xFFFFFFFFFFFF;
/* Return a timestamp corresponding to packets being sent now, and that
* can be passed to rtp_compute_ts() to get rtptime values for each ES.
- * If the stream output is not started, the initial timestamp that will
- * be used with the first packets is returned instead. */
+ * Also return the NPT corresponding to this timestamp. If the stream
+ * output is not started, the initial timestamp that will be used with
+ * the first packets for NPT=0 is returned instead. */
int64_t rtp_get_ts( const sout_stream_t *p_stream, const sout_stream_id_t *id,
- const vod_media_t *p_media, const char *psz_vod_session )
+ const vod_media_t *p_media, const char *psz_vod_session,
+ int64_t *p_npt )
{
+ if (p_npt != NULL)
+ *p_npt = 0;
+
if (id != NULL)
p_stream = id->p_stream;
if( now < i_npt_zero )
return p_sys->i_pts_zero;
- return p_sys->i_pts_zero + (now - i_npt_zero);
+ int64_t npt = now - i_npt_zero;
+ if (p_npt != NULL)
+ *p_npt = npt;
+
+ return p_sys->i_pts_zero + npt;
}
void rtp_packetize_common( sout_stream_id_t *id, block_t *out,
{
sout_access_out_t *p_grab;
- p_grab = vlc_object_create( p_stream->p_sout, sizeof( *p_grab ) );
+ p_grab = vlc_object_create( p_stream, sizeof( *p_grab ) );
if( p_grab == NULL )
return NULL;
p_grab->p_sys = (sout_access_out_sys_t *)p_stream;
p_grab->pf_seek = NULL;
p_grab->pf_write = AccessOutGrabberWrite;
- vlc_object_attach( p_grab, p_stream );
return p_grab;
}