[FFmpeg-devel] [PATCH] document rtsp.h

[Ronald S. Bultje]

Hi,

On Thu, Feb 5, 2009 at 12:27 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Thu, Feb 05, 2009 at 09:24:21AM -0500, Ronald S. Bultje wrote:
>> -    RTSP_LOWER_TRANSPORT_UDP = 0,
>> -    RTSP_LOWER_TRANSPORT_TCP = 1,
>> -    RTSP_LOWER_TRANSPORT_UDP_MULTICAST = 2,
>> +    RTSP_LOWER_TRANSPORT_UDP = 0,           /**< UDP/unicast */
>> +    RTSP_LOWER_TRANSPORT_TCP = 1,           /**< TCP; interleaved in RTSP */
>> +    RTSP_LOWER_TRANSPORT_UDP_MULTICAST = 2, /**< UDP/multicast */
>>      /**
>>       * This is not part of public API and shouldn't be used outside of ffmpeg.
>>       */
>
>>      RTSP_LOWER_TRANSPORT_LAST
>
> this is still a poor name
> RTSP_LOWER_TRANSPORT_NB or _COUNT seems better

OK, $attached. NB similar to PIX_FMT_*.

Ronald
-------------- next part --------------
Index: ffmpeg-svn/libavformat/rtsp.c
===================================================================
--- ffmpeg-svn.orig/libavformat/rtsp.c	2009-02-05 12:11:11.000000000 -0500
+++ ffmpeg-svn/libavformat/rtsp.c	2009-02-05 15:56:35.000000000 -0500
@@ -1097,7 +1097,7 @@
     }
 
     if (!lower_transport_mask)
-        lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_LAST) - 1;
+        lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1;
 
     /* open the tcp connexion */
     snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port);
Index: ffmpeg-svn/libavformat/rtsp.h
===================================================================
--- ffmpeg-svn.orig/libavformat/rtsp.h	2009-02-05 15:55:41.000000000 -0500
+++ ffmpeg-svn/libavformat/rtsp.h	2009-02-05 15:56:21.000000000 -0500
@@ -34,13 +34,13 @@
     /**
      * This is not part of public API and shouldn't be used outside of ffmpeg.
      */
-    RTSP_LOWER_TRANSPORT_LAST
+    RTSP_LOWER_TRANSPORT_NB
 };
 
 enum RTSPTransport {
     RTSP_TRANSPORT_RTP,
     RTSP_TRANSPORT_RDT,
-    RTSP_TRANSPORT_LAST
+    RTSP_TRANSPORT_NB
 };
 
 #define RTSP_DEFAULT_PORT   554
@@ -85,7 +85,7 @@
     RTSP_SERVER_RTP,  /**< Standards-compliant RTP-server */
     RTSP_SERVER_REAL, /**< Realmedia-style server */
     RTSP_SERVER_WMS,  /**< Windows Media server */
-    RTSP_SERVER_LAST
+    RTSP_SERVER_NB
 };
 
 typedef struct RTSPState {