har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Jordi Ortiz 2012-08-17 20:06:27 +02:00 committed by Martin Storsjö
parent d6b9da1178
commit e7993ece9b
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/rtsp.c
View File

@ -1695,6 +1695,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
int n, i, ret, tcp_fd, timeout_cnt = 0; int n, i, ret, tcp_fd, timeout_cnt = 0;
int max_p = 0; int max_p = 0;
struct pollfd *p = rt->p; struct pollfd *p = rt->p;
int *fds = NULL, fdsnum, fdsidx;
for (;;) { for (;;) {
if (ff_check_interrupt(&s->interrupt_callback)) if (ff_check_interrupt(&s->interrupt_callback))
@ -1712,11 +1713,22 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
for (i = 0; i < rt->nb_rtsp_streams; i++) { for (i = 0; i < rt->nb_rtsp_streams; i++) {
rtsp_st = rt->rtsp_streams[i]; rtsp_st = rt->rtsp_streams[i];
if (rtsp_st->rtp_handle) { if (rtsp_st->rtp_handle) {
p[max_p].fd = ffurl_get_file_handle(rtsp_st->rtp_handle); if (ret = ffurl_get_multi_file_handle(rtsp_st->rtp_handle,
p[max_p++].events = POLLIN; &fds, &fdsnum)) {
p[max_p].fd = ff_rtp_get_rtcp_file_handle(rtsp_st->rtp_handle); av_log(s, AV_LOG_ERROR, "Unable to recover rtp ports\n");
return ret;
}
if (fdsnum != 2) {
av_log(s, AV_LOG_ERROR,
"Number of fds %d not supported\n", fdsnum);
return AVERROR_INVALIDDATA;
}
for (fdsidx = 0; fdsidx < fdsnum; fdsidx++) {
p[max_p].fd = fds[fdsidx];
p[max_p++].events = POLLIN; p[max_p++].events = POLLIN;
} }
av_free(fds);
}
} }
n = poll(p, max_p, POLL_TIMEOUT_MS); n = poll(p, max_p, POLL_TIMEOUT_MS);
if (n > 0) { if (n > 0) {