RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/rtp: Pass sources and block filter addresses via sdp file for rtp 

Signed-off-by: Aman Gupta <aman@tmm1.net>
This commit is contained in:
phunkyfish 2020-03-02 19:21:09 +00:00 committed by Aman Gupta
parent ca7a192d10
commit b71685865f
1 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavformat/rtsp.c
View File

@ -2447,8 +2447,8 @@ static int rtp_probe(const AVProbeData *p)
static int rtp_read_header(AVFormatContext *s) static int rtp_read_header(AVFormatContext *s)
{ {
uint8_t recvbuf[RTP_MAX_PACKET_LENGTH]; uint8_t recvbuf[RTP_MAX_PACKET_LENGTH];
char host[500], sdp[500]; char host[500], sdp[1000], filters_buf[1000];
int ret, port; int ret, port, sdp_length, nc;
URLContext* in = NULL; URLContext* in = NULL;
int payload_type; int payload_type;
AVCodecParameters *par = NULL; AVCodecParameters *par = NULL;
@ -2456,6 +2456,7 @@ static int rtp_read_header(AVFormatContext *s)
AVIOContext pb; AVIOContext pb;
socklen_t addrlen = sizeof(addr); socklen_t addrlen = sizeof(addr);
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
const char *p;
if (!ff_network_init()) if (!ff_network_init())
return AVERROR(EIO); return AVERROR(EIO);
@ -2513,13 +2514,40 @@ static int rtp_read_header(AVFormatContext *s)
av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port,
NULL, 0, s->url); NULL, 0, s->url);
snprintf(sdp, sizeof(sdp), sdp_length = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
"v=0\r\nc=IN IP%d %s\r\nm=%s %d RTP/AVP %d\r\n", "v=0\r\nc=IN IP%d %s\r\n",
addr.ss_family == AF_INET ? 4 : 6, host, addr.ss_family == AF_INET ? 4 : 6, host);
par->codec_type == AVMEDIA_TYPE_DATA ? "application" :
par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio", p = strchr(s->url, '?');
port, payload_type); if (p) {
av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp); static const char *filters[][2] = {{"sources", "incl"}, {"block", "excl"}, {NULL, NULL}};
int i;
char *q;
for (i = 0; filters[i][0]; i++) {
if (av_find_info_tag(filters_buf, sizeof(filters_buf), filters[i][0], p)) {
q = filters_buf;
while ((q = strchr(q, ',')) != NULL)
*q = ' ';
nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
"a=source-filter:%s IN IP%d %s %s\r\n",
filters[i][1],
addr.ss_family == AF_INET ? 4 : 6, host,
filters_buf);
if (nc < 0 || nc + sdp_length >= sizeof(sdp))
goto fail_nobuf;
sdp_length += nc;
}
}
}
nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
"m=%s %d RTP/AVP %d\r\n",
par->codec_type == AVMEDIA_TYPE_DATA ? "application" :
par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio",
port, payload_type);
if (nc < 0 || nc + sdp_length >= sizeof(sdp))
goto fail_nobuf;
sdp_length += nc;
avcodec_parameters_free(&par); avcodec_parameters_free(&par);
ffio_init_context(&pb, sdp, strlen(sdp), 0, NULL, NULL, NULL, NULL); ffio_init_context(&pb, sdp, strlen(sdp), 0, NULL, NULL, NULL, NULL);
@ -2534,6 +2562,9 @@ static int rtp_read_header(AVFormatContext *s)
s->pb = NULL; s->pb = NULL;
return ret; return ret;
fail_nobuf:
ret = AVERROR(ENOBUFS);
av_log(s, AV_LOG_ERROR, "rtp_read_header(): not enough buffer space for sdp-headers\n");
fail: fail:
avcodec_parameters_free(&par); avcodec_parameters_free(&par);
if (in) if (in)