Put FRSH support as a separate protocol

[frescor/ffmpeg.git] / libavformat / rtpproto.c

diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 9d80ddf0a7be7722006b2df0f38ca97b5af8f875..727c799619801d4104b29f6151a153353d21e8b0 100644 (file)
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -39,6 +39,16 @@
 #define RTP_TX_BUF_SIZE  (64 * 1024)
 #define RTP_RX_BUF_SIZE  (128 * 1024)
 
+#ifdef OMK_FOR_USER
+#include "libavformat_config.h"
+#endif
+
+#ifdef CONFIG_FFMPEG_WITH_FRSH
+#define URL_PROTO "frsh"
+#else
+#define URL_PROTO "udp"
+#endif
+
 typedef struct RTPContext {
     URLContext *rtp_hd, *rtcp_hd;
     int rtp_fd, rtcp_fd;
@@ -66,10 +76,10 @@ int rtp_set_remote_url(URLContext *h, const char *uri)
     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);
+    snprintf(buf, sizeof(buf), URL_PROTO"://%s:%d%s", hostname, port, path);
     udp_set_remote_url(s->rtp_hd, buf);
 
-    snprintf(buf, sizeof(buf), "udp://%s:%d%s", hostname, port + 1, path);
+    snprintf(buf, sizeof(buf), URL_PROTO"://%s:%d%s", hostname, port + 1, path);
     udp_set_remote_url(s->rtcp_hd, buf);
     return 0;
 }
@@ -98,15 +108,18 @@ 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,
+                         const char *label)
 {
-    snprintf(buf, buf_size, "udp://%s:%d", hostname, port);
+    snprintf(buf, buf_size, URL_PROTO"://%s:%d", hostname, port);
     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);
+    if (label)
+        url_add_option(buf, buf_size, "contract_label=%s", label);
 }
 
 /**
@@ -154,7 +167,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags)
     }
 
     build_udp_url(buf, sizeof(buf),
-                  hostname, port, local_port, ttl, max_packet_size);
+                  hostname, port, local_port, ttl, max_packet_size, "RTP");
     if (url_open(&s->rtp_hd, buf, flags) < 0)
         goto fail;
     local_port = udp_get_local_port(s->rtp_hd);
@@ -163,7 +176,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, ttl, max_packet_size);
+                  hostname, port + 1, local_port + 1, ttl, max_packet_size, "RTCP");
     if (url_open(&s->rtcp_hd, buf, flags) < 0)
         goto fail;