Commit 8bd32c04 authored by Thijs Vermeir's avatar Thijs Vermeir Committed by Benoit Fouet

Add transport method options

patch by Thijs Vermeir thijs vermeir chez barco com
original thread:
[FFmpeg-devel] [PATCH] Add rtsp options support ( added option)

Originally committed as revision 9099 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent badc9ae2
...@@ -847,7 +847,7 @@ static int rtsp_read_header(AVFormatContext *s, ...@@ -847,7 +847,7 @@ static int rtsp_read_header(AVFormatContext *s,
RTSPHeader reply1, *reply = &reply1; RTSPHeader reply1, *reply = &reply1;
unsigned char *content = NULL; unsigned char *content = NULL;
RTSPStream *rtsp_st; RTSPStream *rtsp_st;
int protocol_mask; int protocol_mask = 0;
AVStream *st; AVStream *st;
/* extract hostname and port */ /* extract hostname and port */
...@@ -868,9 +868,18 @@ static int rtsp_read_header(AVFormatContext *s, ...@@ -868,9 +868,18 @@ static int rtsp_read_header(AVFormatContext *s,
if (option_list) if (option_list)
*(option_list++) = 0; *(option_list++) = 0;
/* handle the options */ /* handle the options */
if (strcmp(option, "udp") == 0)
protocol_mask = (1<< RTSP_PROTOCOL_RTP_UDP);
else if (strcmp(option, "multicast") == 0)
protocol_mask = (1<< RTSP_PROTOCOL_RTP_UDP_MULTICAST);
else if (strcmp(option, "tcp") == 0)
protocol_mask = (1<< RTSP_PROTOCOL_RTP_TCP);
} }
} }
if (!protocol_mask)
protocol_mask = rtsp_default_protocols;
/* open the tcp connexion */ /* open the tcp connexion */
snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port); snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port);
if (url_open(&rtsp_hd, tcpname, URL_RDWR) < 0) if (url_open(&rtsp_hd, tcpname, URL_RDWR) < 0)
...@@ -901,8 +910,6 @@ static int rtsp_read_header(AVFormatContext *s, ...@@ -901,8 +910,6 @@ static int rtsp_read_header(AVFormatContext *s,
goto fail; goto fail;
} }
protocol_mask = rtsp_default_protocols;
/* for each stream, make the setup request */ /* for each stream, make the setup request */
/* XXX: we assume the same server is used for the control of each /* XXX: we assume the same server is used for the control of each
RTSP stream */ RTSP stream */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment