ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/rtpproto.c

 /*
  * RTP network protocol
  * Copyright (c) 2002 Fabrice Bellard
  *
  * 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.1 of the License, or (at your option) any later version.
  *
  * 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 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 "rtpdec.h"
 
 #include <unistd.h>
 #include <stdarg.h>
 #include "network.h"
 #include "os_support.h"
 #include <fcntl.h>
 #if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 
@@ skipping 17 matching lines @@
 
 int rtp_set_remote_url(URLContext *h, const char *uri)
 {
     RTPContext *s = h->priv_data;
     char hostname[256];
     int port;
 
     char buf[1024];
     char path[1024];
 
-    url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port,
-              path, sizeof(path), uri);
+    ff_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);
+    ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path);
     udp_set_remote_url(s->rtp_hd, buf);
 
-    snprintf(buf, sizeof(buf), "udp://%s:%d%s", hostname, port + 1, path);
+    ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port + 1, "%s", path);
     udp_set_remote_url(s->rtcp_hd, buf);
     return 0;
 }
 
 
 /**
  * add option to url of the form:
  * "http://host:port/path?option1=val1&option2=val2...
  */
 
@@ skipping 10 matching lines @@
     vsnprintf(buf1, sizeof(buf1), fmt, ap);
     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 ttl,
                           int max_packet_size)
 {
-    snprintf(buf, buf_size, "udp://%s:%d", hostname, port);
+    ff_url_join(buf, buf_size, "udp", NULL, hostname, port, NULL);
     if (local_port >= 0)
         url_add_option(buf, buf_size, "localport=%d", local_port);
     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...]
@@ skipping 12 matching lines @@
     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;
 
-    url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port,
-              path, sizeof(path), uri);
+    ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port,
+                 path, sizeof(path), uri);
     /* extract parameters */
     ttl = -1;
     local_port = -1;
     max_packet_size = -1;
 
     p = strchr(uri, '?');
     if (p) {
         if (find_info_tag(buf, sizeof(buf), "ttl", p)) {
             ttl = strtol(buf, NULL, 10);
         }
@@ skipping 37 matching lines @@
     return AVERROR(EIO);
 }
 
 static int rtp_read(URLContext *h, uint8_t *buf, int size)
 {
     RTPContext *s = h->priv_data;
     struct sockaddr_in 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
     for(;;) {
+        if (url_interrupt_cb())
+            return AVERROR(EINTR);
         /* 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);
-        n = select(fd_max + 1, &rfds, NULL, NULL, NULL);
+        tv.tv_sec = 0;
+        tv.tv_usec = 100 * 1000;
+        n = select(fd_max + 1, &rfds, NULL, NULL, &tv);
         if (n > 0) {
             /* first try RTCP */
             if (FD_ISSET(s->rtcp_fd, &rfds)) {
                 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))
                         continue;
                     return AVERROR(EIO);
                 }
                 break;
             }
             /* then RTP */
             if (FD_ISSET(s->rtp_fd, &rfds)) {
                 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 if (n < 0) {
+            return AVERROR(EIO);
         }
     }
 #endif
     return len;
 }
 
 static int rtp_write(URLContext *h, uint8_t *buf, int size)
 {
     RTPContext *s = h->priv_data;
     int ret;
@@ skipping 65 matching lines @@
 
 URLProtocol rtp_protocol = {
     "rtp",
     rtp_open,
     rtp_read,
     rtp_write,
     NULL, /* seek */
     rtp_close,
     .url_get_file_handle = rtp_get_file_handle,
 };