diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2002-07-24 17:40:26 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2002-07-24 17:40:26 +0000 |
| commit | 85fb7b3490c158786cf68b3dd5fa189fc9221daa (patch) | |
| tree | db064b145ab1311c27a3a81adfae9950332c7e94 | |
| parent | 518855998601da79ead0c5c2e4767872cd66f8f1 (diff) | |
| download | ffmpeg-85fb7b3490c158786cf68b3dd5fa189fc9221daa.tar.gz | |
added rtp port range support
Originally committed as revision 792 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libav/rtsp.c | 31 | ||||
| -rw-r--r-- | libav/rtsp.h | 2 |
2 files changed, 27 insertions, 6 deletions
diff --git a/libav/rtsp.c b/libav/rtsp.c index 8fa813916a..53c8514a62 100644 --- a/libav/rtsp.c +++ b/libav/rtsp.c @@ -47,6 +47,10 @@ int rtsp_abort_req = 0; changing this variable */ int rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_TCP) | (1 << RTSP_PROTOCOL_RTP_UDP) | (1 << RTSP_PROTOCOL_RTP_UDP_MULTICAST); +/* if non zero, then set a range for RTP ports */ +int rtsp_rtp_port_min = 0; +int rtsp_rtp_port_max = 0; + FFRTSPCallback *ff_rtsp_callback = NULL; static int rtsp_probe(AVProbeData *p) @@ -486,8 +490,8 @@ static int rtsp_read_header(AVFormatContext *s, /* XXX: we assume the same server is used for the control of each RTSP stream */ for(i=0;i<s->nb_streams;i++) { - AVInputFormat *fmt; char transport[2048]; + AVInputFormat *fmt; st = s->streams[i]; rtsp_st = st->priv_data; @@ -497,12 +501,27 @@ static int rtsp_read_header(AVFormatContext *s, /* RTP/UDP */ if (protocol_mask & (1 << RTSP_PROTOCOL_RTP_UDP)) { - fmt = &rtp_demux; - if (av_open_input_file(&rtsp_st->ic, "rtp://", fmt, 0, NULL) < 0) { - err = AVERROR_INVALIDDATA; - goto fail; + char buf[256]; + int j; + + /* first try in specified port range */ + if (rtsp_rtp_port_min != 0) { + for(j=rtsp_rtp_port_min;j<=rtsp_rtp_port_max;j++) { + snprintf(buf, sizeof(buf), "rtp://?localport=%d", j); + if (!av_open_input_file(&rtsp_st->ic, buf, + &rtp_demux, 0, NULL)) + goto rtp_opened; + } } - + + /* then try on any port */ + if (av_open_input_file(&rtsp_st->ic, "rtp://", + &rtp_demux, 0, NULL) < 0) { + err = AVERROR_INVALIDDATA; + goto fail; + } + + rtp_opened: port = rtp_get_local_port(url_fileno(&rtsp_st->ic->pb)); if (transport[0] != '\0') pstrcat(transport, sizeof(transport), ","); diff --git a/libav/rtsp.h b/libav/rtsp.h index f683bf338b..3dd231571e 100644 --- a/libav/rtsp.h +++ b/libav/rtsp.h @@ -79,6 +79,8 @@ void rtsp_parse_line(RTSPHeader *reply, const char *buf); extern int rtsp_abort_req; extern int rtsp_default_protocols; +extern int rtsp_rtp_port_min; +extern int rtsp_rtp_port_max; extern FFRTSPCallback *ff_rtsp_callback; #endif /* RTSP_H */ |