X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtpproto.c;h=03794ae1ce2a5d1a28c205fdfb20b1c24c1bb0b9;hb=53ed79a260099c761f8a74872d695a2aeb7a0ced;hp=4ef655d563764eecd52207a37ac0eb3e53c7741d;hpb=cae9a15c98eb9b1ba431d2d55a39171783407bc0;p=ffmpeg diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 4ef655d5637..03794ae1ce2 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -2,31 +2,34 @@ * RTP network protocol * Copyright (c) 2002 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file libavformat/rtpproto.c + * @file * RTP protocol */ +#include "libavutil/parseutils.h" #include "libavutil/avstring.h" #include "avformat.h" +#include "avio_internal.h" #include "rtpdec.h" +#include "url.h" #include #include @@ -34,8 +37,8 @@ #include "network.h" #include "os_support.h" #include -#if HAVE_SYS_SELECT_H -#include +#if HAVE_POLL_H +#include #endif #include @@ -52,12 +55,12 @@ typedef struct RTPContext { * get the local port first, then you must call this function to set * the remote server address. * - * @param s1 media file context + * @param h media file context * @param uri of the remote server * @return zero if no error. */ -int rtp_set_remote_url(URLContext *h, const char *uri) +int ff_rtp_set_remote_url(URLContext *h, const char *uri) { RTPContext *s = h->priv_data; char hostname[256]; @@ -66,14 +69,14 @@ int rtp_set_remote_url(URLContext *h, const char *uri) char buf[1024]; char path[1024]; - ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, + av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path); - udp_set_remote_url(s->rtp_hd, buf); + ff_udp_set_remote_url(s->rtp_hd, buf); ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port + 1, "%s", path); - udp_set_remote_url(s->rtcp_hd, buf); + ff_udp_set_remote_url(s->rtcp_hd, buf); return 0; } @@ -83,7 +86,7 @@ int rtp_set_remote_url(URLContext *h, const char *uri) * "http://host:port/path?option1=val1&option2=val2... */ -static void url_add_option(char *buf, int buf_size, const char *fmt, ...) +static av_printf_format(3, 4) void url_add_option(char *buf, int buf_size, const char *fmt, ...) { char buf1[1024]; va_list ap; @@ -101,7 +104,7 @@ static void url_add_option(char *buf, int buf_size, const char *fmt, ...) static void build_udp_url(char *buf, int buf_size, const char *hostname, int port, int local_port, int ttl, - int max_packet_size) + int max_packet_size, int connect) { ff_url_join(buf, buf_size, "udp", NULL, hostname, port, NULL); if (local_port >= 0) @@ -110,163 +113,160 @@ static void build_udp_url(char *buf, int buf_size, url_add_option(buf, buf_size, "ttl=%d", ttl); if (max_packet_size >=0) url_add_option(buf, buf_size, "pkt_size=%d", max_packet_size); + if (connect) + url_add_option(buf, buf_size, "connect=1"); } /** * url syntax: rtp://host:port[?option=val...] - * option: 'ttl=n' : set the ttl value (for multicast only) - * 'localport=n' : set the local port to n - * 'pkt_size=n' : set max packet size + * option: 'ttl=n' : set the ttl value (for multicast only) + * 'rtcpport=n' : set the remote rtcp port to n + * 'localrtpport=n' : set the local rtp port to n + * 'localrtcpport=n' : set the local rtcp port to n + * 'pkt_size=n' : set max packet size + * 'connect=0/1' : do a connect() on the UDP socket + * deprecated option: + * 'localport=n' : set the local port to n * + * if rtcpport isn't set the rtcp port will be the rtp port + 1 + * if local rtp port isn't set any available port will be used for the local + * rtp and rtcp ports + * if the local rtcp port is not set it will be the local rtp port + 1 */ static int rtp_open(URLContext *h, const char *uri, int flags) { - RTPContext *s; - int port, is_output, ttl, local_port, max_packet_size; + RTPContext *s = h->priv_data; + int rtp_port, rtcp_port, + ttl, connect, + local_rtp_port, local_rtcp_port, max_packet_size; char hostname[256]; char buf[1024]; char path[1024]; const char *p; - is_output = (flags & URL_WRONLY); - - s = av_mallocz(sizeof(RTPContext)); - if (!s) - return AVERROR(ENOMEM); - h->priv_data = s; - - ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, + av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &rtp_port, path, sizeof(path), uri); /* extract parameters */ ttl = -1; - local_port = -1; + rtcp_port = rtp_port+1; + local_rtp_port = -1; + local_rtcp_port = -1; max_packet_size = -1; + connect = 0; p = strchr(uri, '?'); if (p) { - if (find_info_tag(buf, sizeof(buf), "ttl", p)) { + if (av_find_info_tag(buf, sizeof(buf), "ttl", p)) { ttl = strtol(buf, NULL, 10); } - if (find_info_tag(buf, sizeof(buf), "localport", p)) { - local_port = strtol(buf, NULL, 10); + if (av_find_info_tag(buf, sizeof(buf), "rtcpport", p)) { + rtcp_port = strtol(buf, NULL, 10); + } + if (av_find_info_tag(buf, sizeof(buf), "localport", p)) { + local_rtp_port = strtol(buf, NULL, 10); + } + if (av_find_info_tag(buf, sizeof(buf), "localrtpport", p)) { + local_rtp_port = strtol(buf, NULL, 10); + } + if (av_find_info_tag(buf, sizeof(buf), "localrtcpport", p)) { + local_rtcp_port = strtol(buf, NULL, 10); } - if (find_info_tag(buf, sizeof(buf), "pkt_size", p)) { + if (av_find_info_tag(buf, sizeof(buf), "pkt_size", p)) { max_packet_size = strtol(buf, NULL, 10); } + if (av_find_info_tag(buf, sizeof(buf), "connect", p)) { + connect = strtol(buf, NULL, 10); + } } build_udp_url(buf, sizeof(buf), - hostname, port, local_port, ttl, max_packet_size); - if (url_open(&s->rtp_hd, buf, flags) < 0) + hostname, rtp_port, local_rtp_port, ttl, max_packet_size, + connect); + if (ffurl_open(&s->rtp_hd, buf, flags, &h->interrupt_callback, NULL) < 0) goto fail; - local_port = udp_get_local_port(s->rtp_hd); - /* XXX: need to open another connection if the port is not even */ - - /* well, should suppress localport in path */ + if (local_rtp_port>=0 && local_rtcp_port<0) + local_rtcp_port = ff_udp_get_local_port(s->rtp_hd) + 1; build_udp_url(buf, sizeof(buf), - hostname, port + 1, local_port + 1, ttl, max_packet_size); - if (url_open(&s->rtcp_hd, buf, flags) < 0) + hostname, rtcp_port, local_rtcp_port, ttl, max_packet_size, + connect); + if (ffurl_open(&s->rtcp_hd, buf, flags, &h->interrupt_callback, NULL) < 0) goto fail; /* just to ease handle access. XXX: need to suppress direct handle access */ - s->rtp_fd = url_get_file_handle(s->rtp_hd); - s->rtcp_fd = url_get_file_handle(s->rtcp_hd); + s->rtp_fd = ffurl_get_file_handle(s->rtp_hd); + s->rtcp_fd = ffurl_get_file_handle(s->rtcp_hd); - h->max_packet_size = url_get_max_packet_size(s->rtp_hd); + h->max_packet_size = s->rtp_hd->max_packet_size; h->is_streamed = 1; return 0; fail: if (s->rtp_hd) - url_close(s->rtp_hd); + ffurl_close(s->rtp_hd); if (s->rtcp_hd) - url_close(s->rtcp_hd); - av_free(s); + ffurl_close(s->rtcp_hd); return AVERROR(EIO); } static int rtp_read(URLContext *h, uint8_t *buf, int size) { RTPContext *s = h->priv_data; - struct sockaddr_in from; + struct sockaddr_storage from; socklen_t from_len; - int len, fd_max, n; - fd_set rfds; - struct timeval tv; -#if 0 - for(;;) { - from_len = sizeof(from); - len = recvfrom (s->rtp_fd, buf, size, 0, - (struct sockaddr *)&from, &from_len); - if (len < 0) { - if (ff_neterrno() == FF_NETERROR(EAGAIN) || - ff_neterrno() == FF_NETERROR(EINTR)) - continue; - return AVERROR(EIO); - } - break; - } -#else + int len, n; + struct pollfd p[2] = {{s->rtp_fd, POLLIN, 0}, {s->rtcp_fd, POLLIN, 0}}; + for(;;) { - if (url_interrupt_cb()) - return AVERROR(EINTR); + if (ff_check_interrupt(&h->interrupt_callback)) + return AVERROR_EXIT; /* build fdset to listen to RTP and RTCP packets */ - FD_ZERO(&rfds); - fd_max = s->rtp_fd; - FD_SET(s->rtp_fd, &rfds); - if (s->rtcp_fd > fd_max) - fd_max = s->rtcp_fd; - FD_SET(s->rtcp_fd, &rfds); - tv.tv_sec = 0; - tv.tv_usec = 100 * 1000; - n = select(fd_max + 1, &rfds, NULL, NULL, &tv); + n = poll(p, 2, 100); if (n > 0) { /* first try RTCP */ - if (FD_ISSET(s->rtcp_fd, &rfds)) { + if (p[1].revents & POLLIN) { from_len = sizeof(from); len = recvfrom (s->rtcp_fd, buf, size, 0, (struct sockaddr *)&from, &from_len); if (len < 0) { - if (ff_neterrno() == FF_NETERROR(EAGAIN) || - ff_neterrno() == FF_NETERROR(EINTR)) + if (ff_neterrno() == AVERROR(EAGAIN) || + ff_neterrno() == AVERROR(EINTR)) continue; return AVERROR(EIO); } break; } /* then RTP */ - if (FD_ISSET(s->rtp_fd, &rfds)) { + if (p[0].revents & POLLIN) { from_len = sizeof(from); len = recvfrom (s->rtp_fd, buf, size, 0, (struct sockaddr *)&from, &from_len); if (len < 0) { - if (ff_neterrno() == FF_NETERROR(EAGAIN) || - ff_neterrno() == FF_NETERROR(EINTR)) + if (ff_neterrno() == AVERROR(EAGAIN) || + ff_neterrno() == AVERROR(EINTR)) continue; return AVERROR(EIO); } break; } } else if (n < 0) { - if (ff_neterrno() == FF_NETERROR(EINTR)) + if (ff_neterrno() == AVERROR(EINTR)) continue; return AVERROR(EIO); } } -#endif return len; } -static int rtp_write(URLContext *h, uint8_t *buf, int size) +static int rtp_write(URLContext *h, const uint8_t *buf, int size) { RTPContext *s = h->priv_data; int ret; URLContext *hd; - if (buf[1] >= 200 && buf[1] <= 204) { + if (buf[1] >= RTCP_SR && buf[1] <= RTCP_APP) { /* RTCP payload type */ hd = s->rtcp_hd; } else { @@ -274,15 +274,7 @@ static int rtp_write(URLContext *h, uint8_t *buf, int size) hd = s->rtp_hd; } - ret = url_write(hd, buf, size); -#if 0 - { - struct timespec ts; - ts.tv_sec = 0; - ts.tv_nsec = 10 * 1000000; - nanosleep(&ts, NULL); - } -#endif + ret = ffurl_write(hd, buf, size); return ret; } @@ -290,39 +282,34 @@ static int rtp_close(URLContext *h) { RTPContext *s = h->priv_data; - url_close(s->rtp_hd); - url_close(s->rtcp_hd); - av_free(s); + ffurl_close(s->rtp_hd); + ffurl_close(s->rtcp_hd); return 0; } /** - * Return the local port used by the RTP connection - * @param s1 media file context + * Return the local rtp port used by the RTP connection + * @param h media file context * @return the local port number */ -int rtp_get_local_port(URLContext *h) +int ff_rtp_get_local_rtp_port(URLContext *h) { RTPContext *s = h->priv_data; - return udp_get_local_port(s->rtp_hd); + return ff_udp_get_local_port(s->rtp_hd); } -#if (LIBAVFORMAT_VERSION_MAJOR <= 52) /** - * Return the rtp and rtcp file handles for select() usage to wait for - * several RTP streams at the same time. + * Return the local rtcp port used by the RTP connection * @param h media file context + * @return the local port number */ -void rtp_get_file_handles(URLContext *h, int *prtp_fd, int *prtcp_fd) +int ff_rtp_get_local_rtcp_port(URLContext *h) { RTPContext *s = h->priv_data; - - *prtp_fd = s->rtp_fd; - *prtcp_fd = s->rtcp_fd; + return ff_udp_get_local_port(s->rtcp_hd); } -#endif static int rtp_get_file_handle(URLContext *h) { @@ -330,12 +317,18 @@ static int rtp_get_file_handle(URLContext *h) return s->rtp_fd; } -URLProtocol rtp_protocol = { - "rtp", - rtp_open, - rtp_read, - rtp_write, - NULL, /* seek */ - rtp_close, +int ff_rtp_get_rtcp_file_handle(URLContext *h) { + RTPContext *s = h->priv_data; + return s->rtcp_fd; +} + +URLProtocol ff_rtp_protocol = { + .name = "rtp", + .url_open = rtp_open, + .url_read = rtp_read, + .url_write = rtp_write, + .url_close = rtp_close, .url_get_file_handle = rtp_get_file_handle, + .priv_data_size = sizeof(RTPContext), + .flags = URL_PROTOCOL_FLAG_NETWORK, };