[FFmpeg-cvslog] r15484 - in trunk/libavformat: rtsp.c rtsp.h

[rbultje]

Author: rbultje
Date: Tue Sep 30 15:26:20 2008
New Revision: 15484

Log:
Implement a RTSPTransport field, which allows proper separation of server
types and their non-standard extensions, and the data they serve. Practically,
this patch allows Real servers to serve normal non-RDT (standard RTP) data.
See discussion on ML in "Realmedia patch" thread.



Modified:
   trunk/libavformat/rtsp.c
   trunk/libavformat/rtsp.h

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	(original)
+++ trunk/libavformat/rtsp.c	Tue Sep 30 15:26:20 2008
@@ -51,6 +51,12 @@ enum RTSPServerType {
     RTSP_SERVER_LAST
 };
 
+enum RTSPTransport {
+    RTSP_TRANSPORT_RTP,
+    RTSP_TRANSPORT_RDT,
+    RTSP_TRANSPORT_LAST
+};
+
 typedef struct RTSPState {
     URLContext *rtsp_hd; /* RTSP TCP connexion handle */
     int nb_rtsp_streams;
@@ -63,6 +69,7 @@ typedef struct RTSPState {
     //    ByteIOContext rtsp_gb;
     int seq;        /* RTSP command sequence number */
     char session_id[512];
+    enum RTSPTransport transport;
     enum RTSPLowerTransport lower_transport;
     enum RTSPServerType server_type;
     char last_reply[2048]; /* XXX: allocate ? */
@@ -538,6 +545,9 @@ static void sdp_parse_line(AVFormatConte
             rtsp_parse_range_npt(p, &start, &end);
             s->start_time= start;
             s->duration= (end==AV_NOPTS_VALUE)?AV_NOPTS_VALUE:end-start; // AV_NOPTS_VALUE means live broadcast (and can't seek)
+        } else if (av_strstart(p, "IsRealDataType:integer;",&p)) {
+            if (atoi(p) == 1)
+                rt->transport = RTSP_TRANSPORT_RDT;
         } else if (s->nb_streams > 0) {
             rtsp_st = s->streams[s->nb_streams - 1]->priv_data;
             if (rtsp_st->dynamic_handler &&
@@ -636,11 +646,14 @@ static void rtsp_parse_transport(RTSPHea
                 p++;
                 get_word_sep(lower_transport, sizeof(lower_transport),
                              ";,", &p);
-                }
-        } else if (!strcasecmp (transport_protocol, "x-pn-tng")) {
+            }
+            th->transport = RTSP_TRANSPORT_RTP;
+        } else if (!strcasecmp (transport_protocol, "x-pn-tng") ||
+                   !strcasecmp (transport_protocol, "x-real-rdt")) {
             /* x-pn-tng/<protocol> */
             get_word_sep(lower_transport, sizeof(lower_transport), "/;,", &p);
             profile[0] = '\0';
+            th->transport = RTSP_TRANSPORT_RDT;
         }
         if (!strcasecmp(lower_transport, "TCP"))
             th->lower_transport = RTSP_LOWER_TRANSPORT_TCP;
@@ -908,7 +921,7 @@ make_setup_request (AVFormatContext *s, 
     char cmd[2048];
     const char *trans_pref;
 
-    if (rt->server_type == RTSP_SERVER_REAL)
+    if (rt->transport == RTSP_TRANSPORT_RDT)
         trans_pref = "x-pn-tng";
     else
         trans_pref = "RTP/AVP";
@@ -952,7 +965,7 @@ make_setup_request (AVFormatContext *s, 
                 av_strlcat(transport, "unicast;", sizeof(transport));
             av_strlcatf(transport, sizeof(transport),
                      "client_port=%d", port);
-            if (rt->server_type == RTSP_SERVER_RTP)
+            if (rt->transport == RTSP_TRANSPORT_RTP)
                 av_strlcatf(transport, sizeof(transport), "-%d", port + 1);
         }
 
@@ -993,12 +1006,14 @@ make_setup_request (AVFormatContext *s, 
 
         /* XXX: same protocol for all streams is required */
         if (i > 0) {
-            if (reply->transports[0].lower_transport != rt->lower_transport) {
+            if (reply->transports[0].lower_transport != rt->lower_transport ||
+                reply->transports[0].transport != rt->transport) {
                 err = AVERROR_INVALIDDATA;
                 goto fail;
             }
         } else {
             rt->lower_transport = reply->transports[0].lower_transport;
+            rt->transport = reply->transports[0].transport;
         }
 
         /* close RTP connection if not choosen */
@@ -1325,6 +1340,7 @@ static int rtsp_read_packet(AVFormatCont
         for (i = 0; i < rt->nb_rtsp_streams; i++) {
             if (i != 0) av_strlcat(cmd, ",", sizeof(cmd));
             ff_rdt_subscribe_rule(cmd, sizeof(cmd), i, 0);
+            if (rt->transport == RTSP_TRANSPORT_RDT)
             ff_rdt_subscribe_rule2(
                 rt->rtsp_streams[i]->rtp_ctx,
                 cmd, sizeof(cmd), i, 0);
@@ -1341,7 +1357,7 @@ static int rtsp_read_packet(AVFormatCont
 
     /* get next frames from the same RTP packet */
     if (rt->cur_rtp) {
-        if (rt->server_type == RTSP_SERVER_REAL)
+        if (rt->transport == RTSP_TRANSPORT_RDT)
             ret = ff_rdt_parse_packet(rt->cur_rtp, pkt, NULL, 0);
         else
             ret = rtp_parse_packet(rt->cur_rtp, pkt, NULL, 0);
@@ -1371,7 +1387,7 @@ static int rtsp_read_packet(AVFormatCont
     }
     if (len < 0)
         return len;
-    if (rt->server_type == RTSP_SERVER_REAL)
+    if (rt->transport == RTSP_TRANSPORT_RDT)
         ret = ff_rdt_parse_packet(rtsp_st->rtp_ctx, pkt, buf, len);
     else
         ret = rtp_parse_packet(rtsp_st->rtp_ctx, pkt, buf, len);

Modified: trunk/libavformat/rtsp.h
==============================================================================
--- trunk/libavformat/rtsp.h	(original)
+++ trunk/libavformat/rtsp.h	Tue Sep 30 15:26:20 2008
@@ -50,6 +50,7 @@ typedef struct RTSPTransportField {
     int server_port_min, server_port_max; /**< RTP ports */
     int ttl; /**< ttl value */
     uint32_t destination; /**< destination IP address */
+    int transport;
     enum RTSPLowerTransport lower_transport;
 } RTSPTransportField;