X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtpproto.c;h=9d80ddf0a7be7722006b2df0f38ca97b5af8f875;hb=12ad66712a18d039eea73a742ae626b2376f8f4f;hp=4d32e667dacf646058bf7160b377f99dbbe4dd46;hpb=642d4a1a160c7ee90e4b38e268ebe49561fec4c1;p=ffmpeg diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 4d32e667dac..9d80ddf0a7b 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -1,6 +1,6 @@ /* * RTP network protocol - * Copyright (c) 2002 Fabrice Bellard. + * Copyright (c) 2002 Fabrice Bellard * * This file is part of FFmpeg. * @@ -18,12 +18,23 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +/** + * @file libavformat/rtpproto.c + * RTP protocol + */ + +#include "libavutil/avstring.h" #include "avformat.h" #include #include #include "network.h" +#include "os_support.h" #include +#if HAVE_SYS_SELECT_H +#include +#endif #define RTP_TX_BUF_SIZE (64 * 1024) #define RTP_RX_BUF_SIZE (128 * 1024) @@ -42,6 +53,7 @@ typedef struct RTPContext { * @param uri of the remote server * @return zero if no error. */ + int rtp_set_remote_url(URLContext *h, const char *uri) { RTPContext *s = h->priv_data; @@ -63,8 +75,11 @@ int rtp_set_remote_url(URLContext *h, const char *uri) } -/* add option to url of the form: - "http://host:port/path?option1=val1&option2=val2... */ +/** + * add option to url of the form: + * "http://host:port/path?option1=val1&option2=val2... + */ + static void url_add_option(char *buf, int buf_size, const char *fmt, ...) { char buf1[1024]; @@ -72,38 +87,40 @@ static void url_add_option(char *buf, int buf_size, const char *fmt, ...) va_start(ap, fmt); if (strchr(buf, '?')) - pstrcat(buf, buf_size, "&"); + av_strlcat(buf, "&", buf_size); else - pstrcat(buf, buf_size, "?"); + av_strlcat(buf, "?", buf_size); vsnprintf(buf1, sizeof(buf1), fmt, ap); - pstrcat(buf, buf_size, buf1); + av_strlcat(buf, buf1, buf_size); va_end(ap); } static void build_udp_url(char *buf, int buf_size, const char *hostname, int port, - int local_port, int multicast, int ttl) + int local_port, int ttl, + int max_packet_size) { snprintf(buf, buf_size, "udp://%s:%d", hostname, port); if (local_port >= 0) url_add_option(buf, buf_size, "localport=%d", local_port); - if (multicast) - url_add_option(buf, buf_size, "multicast=1"); if (ttl >= 0) 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); } -/* +/** * url syntax: rtp://host:port[?option=val...] - * option: 'multicast=1' : enable multicast - * 'ttl=n' : set the ttl value (for multicast only) + * 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 * */ + static int rtp_open(URLContext *h, const char *uri, int flags) { RTPContext *s; - int port, is_output, is_multicast, ttl, local_port; + int port, is_output, ttl, local_port, max_packet_size; char hostname[256]; char buf[1024]; char path[1024]; @@ -119,38 +136,41 @@ static int rtp_open(URLContext *h, const char *uri, int flags) url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); /* extract parameters */ - is_multicast = 0; ttl = -1; local_port = -1; + max_packet_size = -1; + p = strchr(uri, '?'); if (p) { - is_multicast = find_info_tag(buf, sizeof(buf), "multicast", p); if (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 (find_info_tag(buf, sizeof(buf), "pkt_size", p)) { + max_packet_size = strtol(buf, NULL, 10); + } } build_udp_url(buf, sizeof(buf), - hostname, port, local_port, is_multicast, ttl); + hostname, port, local_port, ttl, max_packet_size); if (url_open(&s->rtp_hd, buf, flags) < 0) goto fail; local_port = udp_get_local_port(s->rtp_hd); - /* XXX: need to open another connexion if the port is not even */ + /* XXX: need to open another connection if the port is not even */ /* well, should suppress localport in path */ build_udp_url(buf, sizeof(buf), - hostname, port + 1, local_port + 1, is_multicast, ttl); + hostname, port + 1, local_port + 1, ttl, max_packet_size); if (url_open(&s->rtcp_hd, buf, flags) < 0) goto fail; /* just to ease handle access. XXX: need to suppress direct handle access */ - s->rtp_fd = udp_get_file_handle(s->rtp_hd); - s->rtcp_fd = udp_get_file_handle(s->rtcp_hd); + s->rtp_fd = url_get_file_handle(s->rtp_hd); + s->rtcp_fd = url_get_file_handle(s->rtcp_hd); h->max_packet_size = url_get_max_packet_size(s->rtp_hd); h->is_streamed = 1; @@ -162,7 +182,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags) if (s->rtcp_hd) url_close(s->rtcp_hd); av_free(s); - return AVERROR_IO; + return AVERROR(EIO); } static int rtp_read(URLContext *h, uint8_t *buf, int size) @@ -178,9 +198,10 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size) len = recvfrom (s->rtp_fd, buf, size, 0, (struct sockaddr *)&from, &from_len); if (len < 0) { - if (errno == EAGAIN || errno == EINTR) + if (ff_neterrno() == FF_NETERROR(EAGAIN) || + ff_neterrno() == FF_NETERROR(EINTR)) continue; - return AVERROR_IO; + return AVERROR(EIO); } break; } @@ -201,9 +222,10 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size) len = recvfrom (s->rtcp_fd, buf, size, 0, (struct sockaddr *)&from, &from_len); if (len < 0) { - if (errno == EAGAIN || errno == EINTR) + if (ff_neterrno() == FF_NETERROR(EAGAIN) || + ff_neterrno() == FF_NETERROR(EINTR)) continue; - return AVERROR_IO; + return AVERROR(EIO); } break; } @@ -213,9 +235,10 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size) len = recvfrom (s->rtp_fd, buf, size, 0, (struct sockaddr *)&from, &from_len); if (len < 0) { - if (errno == EAGAIN || errno == EINTR) + if (ff_neterrno() == FF_NETERROR(EAGAIN) || + ff_neterrno() == FF_NETERROR(EINTR)) continue; - return AVERROR_IO; + return AVERROR(EIO); } break; } @@ -262,21 +285,24 @@ static int rtp_close(URLContext *h) } /** - * Return the local port used by the RTP connexion + * Return the local port used by the RTP connection * @param s1 media file context * @return the local port number */ + int rtp_get_local_port(URLContext *h) { RTPContext *s = h->priv_data; return 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 rtp and rtcp file handles for select() usage to wait for + * several RTP streams at the same time. * @param h media file context */ + void rtp_get_file_handles(URLContext *h, int *prtp_fd, int *prtcp_fd) { RTPContext *s = h->priv_data; @@ -284,6 +310,13 @@ void rtp_get_file_handles(URLContext *h, int *prtp_fd, int *prtcp_fd) *prtp_fd = s->rtp_fd; *prtcp_fd = s->rtcp_fd; } +#endif + +static int rtp_get_file_handle(URLContext *h) +{ + RTPContext *s = h->priv_data; + return s->rtp_fd; +} URLProtocol rtp_protocol = { "rtp", @@ -292,4 +325,5 @@ URLProtocol rtp_protocol = { rtp_write, NULL, /* seek */ rtp_close, + .url_get_file_handle = rtp_get_file_handle, };