comparison rtsp.h @ 4377:8d6f64b2e949 libavformat

Move enum RTSPTransport up a bit, so that all fields that are assigned a value of this type can be properly attributed as such (in this case, transport in the RTSPTransportField struct). See "[PATCH] RTSP-MS 10/15: ASF header parsing" thread on mailinglist.
author rbultje
date Wed, 04 Feb 2009 17:17:20 +0000
parents 77e0c7511d41
children c535276fb3ff
comparison
equal deleted inserted replaced
4376:2b46680bf82f 4377:8d6f64b2e949
35 * This is not part of public API and shouldn't be used outside of ffmpeg. 35 * This is not part of public API and shouldn't be used outside of ffmpeg.
36 */ 36 */
37 RTSP_LOWER_TRANSPORT_LAST 37 RTSP_LOWER_TRANSPORT_LAST
38 }; 38 };
39 39
40 enum RTSPTransport {
41 RTSP_TRANSPORT_RTP,
42 RTSP_TRANSPORT_RDT,
43 RTSP_TRANSPORT_LAST
44 };
45
40 #define RTSP_DEFAULT_PORT 554 46 #define RTSP_DEFAULT_PORT 554
41 #define RTSP_MAX_TRANSPORTS 8 47 #define RTSP_MAX_TRANSPORTS 8
42 #define RTSP_TCP_MAX_PACKET_SIZE 1472 48 #define RTSP_TCP_MAX_PACKET_SIZE 1472
43 #define RTSP_DEFAULT_NB_AUDIO_CHANNELS 2 49 #define RTSP_DEFAULT_NB_AUDIO_CHANNELS 2
44 #define RTSP_DEFAULT_AUDIO_SAMPLERATE 44100 50 #define RTSP_DEFAULT_AUDIO_SAMPLERATE 44100
50 int port_min, port_max; /**< RTP ports */ 56 int port_min, port_max; /**< RTP ports */
51 int client_port_min, client_port_max; /**< RTP ports */ 57 int client_port_min, client_port_max; /**< RTP ports */
52 int server_port_min, server_port_max; /**< RTP ports */ 58 int server_port_min, server_port_max; /**< RTP ports */
53 int ttl; /**< ttl value */ 59 int ttl; /**< ttl value */
54 uint32_t destination; /**< destination IP address */ 60 uint32_t destination; /**< destination IP address */
55 int transport; 61 enum RTSPTransport transport;
56 enum RTSPLowerTransport lower_transport; 62 enum RTSPLowerTransport lower_transport;
57 } RTSPTransportField; 63 } RTSPTransportField;
58 64
59 typedef struct RTSPHeader { 65 typedef struct RTSPHeader {
60 int content_length; 66 int content_length;
78 enum RTSPServerType { 84 enum RTSPServerType {
79 RTSP_SERVER_RTP, /**< Standards-compliant RTP-server */ 85 RTSP_SERVER_RTP, /**< Standards-compliant RTP-server */
80 RTSP_SERVER_REAL, /**< Realmedia-style server */ 86 RTSP_SERVER_REAL, /**< Realmedia-style server */
81 RTSP_SERVER_WMS, /**< Windows Media server */ 87 RTSP_SERVER_WMS, /**< Windows Media server */
82 RTSP_SERVER_LAST 88 RTSP_SERVER_LAST
83 };
84
85 enum RTSPTransport {
86 RTSP_TRANSPORT_RTP,
87 RTSP_TRANSPORT_RDT,
88 RTSP_TRANSPORT_LAST
89 }; 89 };
90 90
91 typedef struct RTSPState { 91 typedef struct RTSPState {
92 URLContext *rtsp_hd; /* RTSP TCP connexion handle */ 92 URLContext *rtsp_hd; /* RTSP TCP connexion handle */
93 int nb_rtsp_streams; 93 int nb_rtsp_streams;