mirror of
https://github.com/videolan/vlc.git
synced 2024-12-05 07:46:32 +08:00
access: add RIST module
RIST for the Reliable Internet Stream Transport Protocol The implementation follows the Video Services Forum (VSF) Technical Recommendation TR-06 which defines an ARQ based UDP transmission protocol for real-time streaming over lossy networks (internet, wifi, etc). Signed-off-by: Thomas Guillem <thomas@gllm.fr>
This commit is contained in:
Sergio Ammirata
Thomas Guillem
parent
abf93d8f78
commit
2cb6e84597
1
NEWS
1
NEWS
@ -29,6 +29,7 @@ Codecs:
|
||||
|
||||
Access:
|
||||
* Enable SMB2 / SMB3 support on mobile ports with libsmb2
|
||||
* Added support for the RIST (Reliable Internet Stream Transport) Protocol
|
||||
|
||||
Video output:
|
||||
* Remove aa plugin
|
||||
|
||||
@ -17,6 +17,7 @@ $Id$
|
||||
* access_output_srt: SRT (Secure Reliable Transport) access_output module
|
||||
* access_output_udp: UDP Network access_output module
|
||||
* access_qtsound: Quicktime Audio Capture
|
||||
* access_rist: RIST (Reliable Internet Stream Transport) access module
|
||||
* access_srt: SRT(Secure Reliable Transport) access module
|
||||
* access_wasapi: WASAPI audio input
|
||||
* accesstweaks: access control tweaking module (dev tool)
|
||||
|
||||
@ -428,3 +428,11 @@ libaccess_srt_plugin_la_LIBADD = $(SRT_LIBS)
|
||||
libaccess_srt_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
|
||||
access_LTLIBRARIES += $(LTLIBaccess_srt)
|
||||
EXTRA_LTLIBRARIES += libaccess_srt_plugin.la
|
||||
|
||||
### RIST ###
|
||||
|
||||
librist_plugin_la_SOURCES = access/rist.c access/rist.h
|
||||
librist_plugin_la_CFLAGS = $(AM_CFLAGS) $(BITSTREAM_CFLAGS)
|
||||
if HAVE_BITSTREAM
|
||||
access_LTLIBRARIES += librist_plugin.la
|
||||
endif
|
||||
|
||||
1088
modules/access/rist.c
Normal file
1088
modules/access/rist.c
Normal file
File diff suppressed because it is too large
Load Diff
335
modules/access/rist.h
Normal file
335
modules/access/rist.h
Normal file
@ -0,0 +1,335 @@
|
||||
/*****************************************************************************
|
||||
* rist.h: RIST (Reliable Internet Stream Transport) helper
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2018, DVEO, the Broadcast Division of Computer Modules, Inc.
|
||||
* Copyright (C) 2018, SipRadius LLC
|
||||
*
|
||||
* Authors: Sergio Ammirata <sergio@ammirata.net>
|
||||
* Daniele Lacamera <root@danielinux.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation; either version 2.1 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
|
||||
*****************************************************************************/
|
||||
|
||||
#include <stdint.h>
|
||||
#ifdef HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#include <errno.h>
|
||||
#include <assert.h>
|
||||
|
||||
/*****************************************************************************
|
||||
* Public API
|
||||
*****************************************************************************/
|
||||
|
||||
/* RIST */
|
||||
|
||||
/* RTP header format (RFC 3550) */
|
||||
/*
|
||||
0 1 2 3
|
||||
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
|V=2|P|X| CC |M| PT | sequence number |
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
| timestamp |
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
| synchronization source (SSRC) identifier |
|
||||
+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
|
||||
| contributing source (CSRC) identifiers |
|
||||
| .... |
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
*/
|
||||
|
||||
#define RIST_QUEUE_SIZE 65536
|
||||
#define RTP_PKT_SIZE (1472)
|
||||
|
||||
#define RTCP_INTERVAL 75 /*ms*/
|
||||
|
||||
#define SEVENTY_YEARS_OFFSET (2208988800ULL)
|
||||
#define MAX_NACKS 32
|
||||
#define MAX_CNAME 128
|
||||
#define RTCP_EMPTY_RR_SIZE 8
|
||||
|
||||
#define RTCP_PT_RTPFR 204
|
||||
|
||||
struct rtp_pkt {
|
||||
uint32_t rtp_ts;
|
||||
struct block_t *buffer;
|
||||
};
|
||||
|
||||
/* RIST NACK header format */
|
||||
/*
|
||||
0 1 2 3
|
||||
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
| SNBase low bits | Length recovery |
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
|E| PT recovery | Mask |
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
| TS recovery |
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
|N|D|type |index| Offset | NA |SNBase ext bits|
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
*/
|
||||
|
||||
struct rist_flow {
|
||||
uint8_t reset;
|
||||
struct rtp_pkt *buffer;
|
||||
uint32_t qsize;
|
||||
uint32_t last_out;
|
||||
uint32_t ssrc;
|
||||
char cname[MAX_CNAME];
|
||||
struct sockaddr_storage peer_sockaddr;
|
||||
socklen_t peer_socklen;
|
||||
uint16_t ri,
|
||||
wi;
|
||||
int fd_in;
|
||||
int fd_out;
|
||||
int fd_rtcp;
|
||||
int fd_nack;
|
||||
uint8_t nacks_retries[RIST_QUEUE_SIZE];
|
||||
uint32_t hi_timestamp;
|
||||
uint64_t feedback_time;
|
||||
uint32_t latency;
|
||||
uint32_t rtp_latency;
|
||||
uint32_t retry_interval;
|
||||
uint32_t reorder_buffer;
|
||||
uint8_t max_retries;
|
||||
uint32_t packets_count;
|
||||
uint32_t bytes_count;
|
||||
};
|
||||
|
||||
static inline uint16_t rtcp_fb_nack_get_range_start(const uint8_t *p_rtcp_fb_nack)
|
||||
{
|
||||
return (p_rtcp_fb_nack[0] << 8) | p_rtcp_fb_nack[1];
|
||||
}
|
||||
|
||||
static inline uint16_t rtcp_fb_nack_get_range_extra(const uint8_t *p_rtcp_fb_nack)
|
||||
{
|
||||
return (p_rtcp_fb_nack[2] << 8) | p_rtcp_fb_nack[3];
|
||||
}
|
||||
|
||||
static inline void rtcp_fb_nack_set_range_start(uint8_t *p_rtcp_fb_nack,
|
||||
uint16_t start)
|
||||
{
|
||||
p_rtcp_fb_nack[0] = (start >> 8) & 0xff;
|
||||
p_rtcp_fb_nack[1] = start & 0xff;
|
||||
}
|
||||
|
||||
static inline void rtcp_fb_nack_set_range_extra(uint8_t *p_rtcp_fb_nack,
|
||||
uint16_t extra)
|
||||
{
|
||||
p_rtcp_fb_nack[2] = (extra >> 8) & 0xff;
|
||||
p_rtcp_fb_nack[3] = extra & 0xff;
|
||||
}
|
||||
|
||||
static inline void populate_cname(int fd, char *identifier)
|
||||
{
|
||||
/* Set the CNAME Identifier as host@ip:port and fallback to hostname if needed */
|
||||
char hostname[MAX_CNAME];
|
||||
struct sockaddr_storage peer_sockaddr;
|
||||
int name_length = 0;
|
||||
socklen_t peer_socklen;
|
||||
int ret_hostname = gethostname(hostname, MAX_CNAME);
|
||||
if (ret_hostname == -1)
|
||||
snprintf(hostname, MAX_CNAME, "UnknownHost");
|
||||
int ret_sockname = getsockname(fd, (struct sockaddr *)&peer_sockaddr, &peer_socklen);
|
||||
if (ret_sockname == 0)
|
||||
{
|
||||
struct sockaddr *peer = (struct sockaddr *)&peer_sockaddr;
|
||||
if (peer->sa_family == AF_INET) {
|
||||
struct sockaddr_in *xin = (void*)peer;
|
||||
name_length = snprintf(identifier, MAX_CNAME, "%s@%s:%u", hostname,
|
||||
inet_ntoa(xin->sin_addr), ntohs(xin->sin_port));
|
||||
if (name_length >= MAX_CNAME)
|
||||
identifier[MAX_CNAME-1] = 0;
|
||||
} else if (peer->sa_family == AF_INET6) {
|
||||
struct sockaddr_in6 *xin6 = (void*)peer;
|
||||
char str[INET6_ADDRSTRLEN];
|
||||
inet_ntop(xin6->sin6_family, &xin6->sin6_addr, str, sizeof(struct in6_addr));
|
||||
name_length = snprintf(identifier, MAX_CNAME, "%s@%s:%u", hostname,
|
||||
str, ntohs(xin6->sin6_port));
|
||||
if (name_length >= MAX_CNAME)
|
||||
identifier[MAX_CNAME-1] = 0;
|
||||
}
|
||||
}
|
||||
if (name_length == 0)
|
||||
{
|
||||
name_length = snprintf(identifier, MAX_CNAME, "%s", hostname);
|
||||
if (name_length >= MAX_CNAME)
|
||||
identifier[MAX_CNAME-1] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static inline uint32_t rtp_get_ts( vlc_tick_t i_pts )
|
||||
{
|
||||
unsigned i_clock_rate = 90000;
|
||||
/* This is an overflow-proof way of doing:
|
||||
* return i_pts * (int64_t)i_clock_rate / CLOCK_FREQ;
|
||||
*
|
||||
* NOTE: this plays nice with offsets because the (equivalent)
|
||||
* calculations are linear. */
|
||||
lldiv_t q = lldiv(i_pts, CLOCK_FREQ);
|
||||
return q.quot * (int64_t)i_clock_rate
|
||||
+ q.rem * (int64_t)i_clock_rate / CLOCK_FREQ;
|
||||
}
|
||||
|
||||
static inline vlc_tick_t ts_get_from_rtp( uint32_t i_rtp_ts )
|
||||
{
|
||||
unsigned i_clock_rate = 90000;
|
||||
return (vlc_tick_t)i_rtp_ts * (vlc_tick_t)(CLOCK_FREQ/i_clock_rate);
|
||||
}
|
||||
|
||||
static inline ssize_t rist_ReadFrom_i11e(int fd, void *buf, size_t len, struct sockaddr *peer,
|
||||
socklen_t *slen)
|
||||
{
|
||||
ssize_t ret = -1;
|
||||
|
||||
if (peer == NULL)
|
||||
ret = vlc_recv_i11e(fd, buf, len, 0);
|
||||
else
|
||||
ret = vlc_recvfrom_i11e(fd, buf, len, 0, peer, slen);
|
||||
|
||||
if (ret == -1)
|
||||
{
|
||||
switch (errno)
|
||||
{
|
||||
case EAGAIN:
|
||||
case EINTR:
|
||||
if (vlc_killed())
|
||||
return ret;
|
||||
|
||||
/* retry one time */
|
||||
if (peer == NULL)
|
||||
ret = vlc_recv_i11e(fd, buf, len, 0);
|
||||
else
|
||||
ret = vlc_recvfrom_i11e(fd, buf, len, 0, peer, slen);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline ssize_t rist_Read_i11e(int fd, void *buf, size_t len)
|
||||
{
|
||||
return rist_ReadFrom_i11e(fd, buf, len, NULL, NULL);
|
||||
}
|
||||
|
||||
static inline ssize_t rist_ReadFrom(int fd, void *buf, size_t len, struct sockaddr *peer,
|
||||
socklen_t *slen)
|
||||
{
|
||||
ssize_t ret = -1;
|
||||
|
||||
if (peer == NULL)
|
||||
ret = recv(fd, buf, len, 0);
|
||||
else
|
||||
ret = recvfrom(fd, buf, len, 0, peer, slen);
|
||||
|
||||
if (ret == -1)
|
||||
{
|
||||
switch (errno)
|
||||
{
|
||||
case EAGAIN:
|
||||
case EINTR:
|
||||
/* retry one time */
|
||||
if (peer == NULL)
|
||||
ret = recv(fd, buf, len, 0);
|
||||
else
|
||||
ret = recvfrom(fd, buf, len, 0, peer, slen);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline ssize_t rist_Read(int fd, void *buf, size_t len)
|
||||
{
|
||||
return rist_ReadFrom(fd, buf, len, NULL, NULL);
|
||||
}
|
||||
|
||||
static inline ssize_t rist_WriteTo_i11e(int fd, const void *buf, size_t len,
|
||||
const struct sockaddr *peer, socklen_t slen)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
# define ENOBUFS WSAENOBUFS
|
||||
# define EAGAIN WSAEWOULDBLOCK
|
||||
# define EWOULDBLOCK WSAEWOULDBLOCK
|
||||
#endif
|
||||
ssize_t r = -1;
|
||||
if (slen == 0)
|
||||
r = vlc_send_i11e( fd, buf, len, 0 );
|
||||
else
|
||||
r = vlc_sendto_i11e( fd, buf, len, 0, peer, slen );
|
||||
if( r == -1
|
||||
&& net_errno != EAGAIN && net_errno != EWOULDBLOCK
|
||||
&& net_errno != ENOBUFS && net_errno != ENOMEM )
|
||||
{
|
||||
int type;
|
||||
getsockopt( fd, SOL_SOCKET, SO_TYPE,
|
||||
&type, &(socklen_t){ sizeof(type) });
|
||||
if( type == SOCK_DGRAM )
|
||||
{
|
||||
/* ICMP soft error: ignore and retry */
|
||||
if (slen == 0)
|
||||
r = vlc_send_i11e( fd, buf, len, 0 );
|
||||
else
|
||||
r = vlc_sendto_i11e( fd, buf, len, 0, peer, slen );
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
static inline ssize_t rist_Write_i11e(int fd, const void *buf, size_t len)
|
||||
{
|
||||
return rist_WriteTo_i11e(fd, buf, len, NULL, 0);
|
||||
}
|
||||
|
||||
static inline ssize_t rist_WriteTo(int fd, const void *buf, size_t len, const struct sockaddr *peer,
|
||||
socklen_t slen)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
# define ENOBUFS WSAENOBUFS
|
||||
# define EAGAIN WSAEWOULDBLOCK
|
||||
# define EWOULDBLOCK WSAEWOULDBLOCK
|
||||
#endif
|
||||
ssize_t r = -1;
|
||||
if (slen == 0)
|
||||
r = send( fd, buf, len, 0 );
|
||||
else
|
||||
r = sendto( fd, buf, len, 0, peer, slen );
|
||||
if( r == -1
|
||||
&& net_errno != EAGAIN && net_errno != EWOULDBLOCK
|
||||
&& net_errno != ENOBUFS && net_errno != ENOMEM )
|
||||
{
|
||||
int type;
|
||||
getsockopt( fd, SOL_SOCKET, SO_TYPE,
|
||||
&type, &(socklen_t){ sizeof(type) });
|
||||
if( type == SOCK_DGRAM )
|
||||
{
|
||||
/* ICMP soft error: ignore and retry */
|
||||
if (slen == 0)
|
||||
r = send( fd, buf, len, 0 );
|
||||
else
|
||||
r = sendto( fd, buf, len, 0, peer, slen );
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
static inline ssize_t rist_Write(int fd, const void *buf, size_t len)
|
||||
{
|
||||
return rist_WriteTo(fd, buf, len, NULL, 0);
|
||||
}
|
||||
@ -198,6 +198,8 @@ modules/access/oss.c
|
||||
modules/access/pulse.c
|
||||
modules/access/qtsound.m
|
||||
modules/access/rdp.c
|
||||
modules/access/rist.h
|
||||
modules/access/rist.c
|
||||
modules/access/rtp/rtp.c
|
||||
modules/access/samba.c
|
||||
modules/access/satip.c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user