X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtpproto.c;h=73f07c6ccdf1a8ea6ea27b8bb353d1b02b4a309a;hb=8d75b5a2fb966673a5f08339e159096220abaf98;hp=41823fc82937b6ae81a9c7c31dcdd57c602e2099;hpb=abac6175916c57f59ddb51ffe41bfd1d9851fe38;p=ffmpeg diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 41823fc8293..73f07c6ccdf 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -2,33 +2,27 @@ * RTP network protocol * Copyright (c) 2002 Fabrice Bellard. * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * FFmpeg 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" #include #include -#include -#include -#include -#ifndef __BEOS__ -# include -#else -# include "barpainet.h" -#endif -#include +#include "network.h" #include #define RTP_TX_BUF_SIZE (64 * 1024) @@ -56,8 +50,8 @@ int rtp_set_remote_url(URLContext *h, const char *uri) char buf[1024]; char path[1024]; - - url_split(NULL, 0, hostname, sizeof(hostname), &port, + + url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); snprintf(buf, sizeof(buf), "udp://%s:%d%s", hostname, port, path); @@ -71,7 +65,7 @@ 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... */ -void url_add_option(char *buf, int buf_size, const char *fmt, ...) +static void url_add_option(char *buf, int buf_size, const char *fmt, ...) { char buf1[1024]; va_list ap; @@ -86,22 +80,22 @@ void url_add_option(char *buf, int buf_size, const char *fmt, ...) va_end(ap); } -void build_udp_url(char *buf, int buf_size, - const char *hostname, int port, - int local_port, int multicast, int ttl) +static void build_udp_url(char *buf, int buf_size, + const char *hostname, int port, + int local_port, int multicast, int ttl) { 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", multicast); + url_add_option(buf, buf_size, "multicast=1"); if (ttl >= 0) url_add_option(buf, buf_size, "ttl=%d", ttl); } /* * url syntax: rtp://host:port[?option=val...] - * option: 'multicast=1' : enable multicast + * option: 'multicast=1' : enable multicast * 'ttl=n' : set the ttl value (for multicast only) * 'localport=n' : set the local port to n * @@ -114,15 +108,15 @@ static int rtp_open(URLContext *h, const char *uri, int flags) char buf[1024]; char path[1024]; const char *p; - + is_output = (flags & URL_WRONLY); s = av_mallocz(sizeof(RTPContext)); if (!s) - return -ENOMEM; + return AVERROR(ENOMEM); h->priv_data = s; - - url_split(NULL, 0, hostname, sizeof(hostname), &port, + + url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); /* extract parameters */ is_multicast = 0; @@ -144,21 +138,21 @@ static int rtp_open(URLContext *h, const char *uri, int flags) 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); 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); - h->max_packet_size = url_get_max_packet_size(s->rtp_hd); + h->max_packet_size = url_get_max_packet_size(s->rtp_hd); h->is_streamed = 1; return 0; @@ -168,14 +162,15 @@ static int rtp_open(URLContext *h, const char *uri, int flags) if (s->rtcp_hd) url_close(s->rtcp_hd); av_free(s); - return -EIO; + return AVERROR_IO; } -static int rtp_read(URLContext *h, UINT8 *buf, int size) +static int rtp_read(URLContext *h, uint8_t *buf, int size) { RTPContext *s = h->priv_data; struct sockaddr_in from; - int from_len, len, fd_max, n; + socklen_t from_len; + int len, fd_max, n; fd_set rfds; #if 0 for(;;) { @@ -183,9 +178,10 @@ static int rtp_read(URLContext *h, UINT8 *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 -EIO; + return AVERROR_IO; } break; } @@ -206,9 +202,10 @@ static int rtp_read(URLContext *h, UINT8 *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 -EIO; + return AVERROR_IO; } break; } @@ -218,9 +215,10 @@ static int rtp_read(URLContext *h, UINT8 *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 -EIO; + return AVERROR_IO; } break; } @@ -230,12 +228,12 @@ static int rtp_read(URLContext *h, UINT8 *buf, int size) return len; } -static int rtp_write(URLContext *h, UINT8 *buf, int size) +static int rtp_write(URLContext *h, uint8_t *buf, int size) { RTPContext *s = h->priv_data; int ret; URLContext *hd; - + if (buf[1] >= 200 && buf[1] <= 204) { /* RTCP payload type */ hd = s->rtcp_hd; @@ -267,7 +265,7 @@ 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 */