X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtpproto.c;h=610a7f78590f7af30453cfb097c8126cfff50d72;hb=be62f5569e40a578ffed8662c4f98182c0a15fe3;hp=d1d5a924773cfbb317f9cfdbaa764baaffecae3a;hpb=93115b82f07772584f33c5f4c59bcdfa042eb564;p=ffmpeg

diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index d1d5a924773..610a7f78590 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,14 +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 "avstring.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
 
 #define RTP_TX_BUF_SIZE  (64 * 1024)
 #define RTP_RX_BUF_SIZE  (128 * 1024)
@@ -44,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;
@@ -65,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];
@@ -84,28 +97,30 @@ 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 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];
@@ -121,22 +136,25 @@ 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);
@@ -145,7 +163,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags)
     /* 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;
 
@@ -271,6 +289,7 @@ static int rtp_close(URLContext *h)
  * @param s1 media file context
  * @return the local port number
  */
+
 int rtp_get_local_port(URLContext *h)
 {
     RTPContext *s = h->priv_data;
@@ -278,10 +297,11 @@ int rtp_get_local_port(URLContext *h)
 }
 
 /**
- * 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;