diff options
Diffstat (limited to 'gst/rtsp')
| -rw-r--r-- | gst/rtsp/gstrtspsrc.c | 54 | ||||
| -rw-r--r-- | gst/rtsp/gstrtspsrc.h | 32 | ||||
| -rw-r--r-- | gst/rtsp/rtspconnection.h | 20 | ||||
| -rw-r--r-- | gst/rtsp/rtspdefs.h | 214 | ||||
| -rw-r--r-- | gst/rtsp/rtspmessage.h | 46 | ||||
| -rw-r--r-- | gst/rtsp/rtsptransport.h | 30 | ||||
| -rw-r--r-- | gst/rtsp/rtspurl.c | 8 | ||||
| -rw-r--r-- | gst/rtsp/rtspurl.h | 6 | ||||
| -rw-r--r-- | gst/rtsp/sdpmessage.c | 72 | ||||
| -rw-r--r-- | gst/rtsp/sdpmessage.h | 156 |
10 files changed, 319 insertions, 319 deletions
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index da6e79bf..70110501 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -52,9 +52,9 @@ enum LAST_SIGNAL }; -#define DEFAULT_LOCATION NULL -#define DEFAULT_PROTOCOLS GST_RTSP_PROTO_UDP_UNICAST | GST_RTSP_PROTO_UDP_MULTICAST | GST_RTSP_PROTO_TCP -#define DEFAULT_DEBUG FALSE +#define DEFAULT_LOCATION NULL +#define DEFAULT_PROTOCOLS GST_RTSP_PROTO_UDP_UNICAST | GST_RTSP_PROTO_UDP_MULTICAST | GST_RTSP_PROTO_TCP +#define DEFAULT_DEBUG FALSE enum { @@ -300,34 +300,34 @@ done: return ret; } -#define PARSE_INT(p, del, res) \ -G_STMT_START { \ - gchar *t = p; \ - p = strstr (p, del); \ - if (p == NULL) \ - res = -1; \ - else { \ - *p = '\0'; \ - p++; \ - res = atoi (t); \ - } \ +#define PARSE_INT(p, del, res) \ +G_STMT_START { \ + gchar *t = p; \ + p = strstr (p, del); \ + if (p == NULL) \ + res = -1; \ + else { \ + *p = '\0'; \ + p++; \ + res = atoi (t); \ + } \ } G_STMT_END -#define PARSE_STRING(p, del, res) \ -G_STMT_START { \ - gchar *t = p; \ - p = strstr (p, del); \ - if (p == NULL) \ - res = NULL; \ - else { \ - *p = '\0'; \ - p++; \ - res = t; \ - } \ +#define PARSE_STRING(p, del, res) \ +G_STMT_START { \ + gchar *t = p; \ + p = strstr (p, del); \ + if (p == NULL) \ + res = NULL; \ + else { \ + *p = '\0'; \ + p++; \ + res = t; \ + } \ } G_STMT_END -#define SKIP_SPACES(p) \ - while (*p && g_ascii_isspace (*p)) \ +#define SKIP_SPACES(p) \ + while (*p && g_ascii_isspace (*p)) \ p++; static gboolean diff --git a/gst/rtsp/gstrtspsrc.h b/gst/rtsp/gstrtspsrc.h index 89604d2e..2cab470a 100644 --- a/gst/rtsp/gstrtspsrc.h +++ b/gst/rtsp/gstrtspsrc.h @@ -47,18 +47,18 @@ typedef struct _GstRTSPSrcClass GstRTSPSrcClass; /* flags with allowed protocols */ typedef enum { - GST_RTSP_PROTO_UDP_UNICAST = (1 << 0), - GST_RTSP_PROTO_UDP_MULTICAST = (1 << 1), - GST_RTSP_PROTO_TCP = (1 << 2), + GST_RTSP_PROTO_UDP_UNICAST = (1 << 0), + GST_RTSP_PROTO_UDP_MULTICAST = (1 << 1), + GST_RTSP_PROTO_TCP = (1 << 2), } GstRTSPProto; typedef struct _GstRTSPStream GstRTSPStream; struct _GstRTSPStream { - gint id; + gint id; - gint rtpchannel; - gint rtcpchannel; + gint rtpchannel; + gint rtcpchannel; GstRTSPSrc *parent; @@ -78,22 +78,22 @@ struct _GstRTSPStream { struct _GstRTSPSrc { GstElement element; - gboolean interleaved; - GstTask *task; + gboolean interleaved; + GstTask *task; - gint numstreams; - GList *streams; + gint numstreams; + GList *streams; - gchar *location; - gboolean debug; + gchar *location; + gboolean debug; - GstRTSPProto protocols; + GstRTSPProto protocols; /* supported options */ - gint options; + gint options; RTSPConnection *connection; - RTSPMessage *request; - RTSPMessage *response; + RTSPMessage *request; + RTSPMessage *response; }; struct _GstRTSPSrcClass { diff --git a/gst/rtsp/rtspconnection.h b/gst/rtsp/rtspconnection.h index 720c1471..6af3fde9 100644 --- a/gst/rtsp/rtspconnection.h +++ b/gst/rtsp/rtspconnection.h @@ -30,23 +30,23 @@ G_BEGIN_DECLS typedef struct _RTSPConnection { - gint fd; /* our socket */ + gint fd; /* our socket */ - gint cseq; /* sequence number */ - gchar session_id[512]; /* session id */ + gint cseq; /* sequence number */ + gchar session_id[512]; /* session id */ - RTSPState state; /* state of the connection */ + RTSPState state; /* state of the connection */ } RTSPConnection; /* opening/closing a connection */ -RTSPResult rtsp_connection_open (RTSPUrl *url, RTSPConnection **conn); -RTSPResult rtsp_connection_create (gint fd, RTSPConnection **conn); -RTSPResult rtsp_connection_close (RTSPConnection *conn); -RTSPResult rtsp_connection_free (RTSPConnection *conn); +RTSPResult rtsp_connection_open (RTSPUrl *url, RTSPConnection **conn); +RTSPResult rtsp_connection_create (gint fd, RTSPConnection **conn); +RTSPResult rtsp_connection_close (RTSPConnection *conn); +RTSPResult rtsp_connection_free (RTSPConnection *conn); /* sending/receiving messages */ -RTSPResult rtsp_connection_send (RTSPConnection *conn, RTSPMessage *message); -RTSPResult rtsp_connection_receive (RTSPConnection *conn, RTSPMessage *message); +RTSPResult rtsp_connection_send (RTSPConnection *conn, RTSPMessage *message); +RTSPResult rtsp_connection_receive (RTSPConnection *conn, RTSPMessage *message); G_END_DECLS diff --git a/gst/rtsp/rtspdefs.h b/gst/rtsp/rtspdefs.h index 9ba100fe..c5b4474e 100644 --- a/gst/rtsp/rtspdefs.h +++ b/gst/rtsp/rtspdefs.h @@ -25,14 +25,14 @@ G_BEGIN_DECLS typedef enum { - RTSP_OK = 0, + RTSP_OK = 0, /* errors */ - RTSP_EINVAL = -1, - RTSP_ENOMEM = -2, - RTSP_ERESOLV = -3, - RTSP_ENOTIMPL = -4, - RTSP_ESYS = -5, - RTSP_EPARSE = -6, + RTSP_EINVAL = -1, + RTSP_ENOMEM = -2, + RTSP_ERESOLV = -3, + RTSP_ENOTIMPL = -4, + RTSP_ESYS = -5, + RTSP_EPARSE = -6, } RTSPResult; typedef enum { @@ -54,17 +54,17 @@ typedef enum { } RTSPState; typedef enum { - RTSP_DESCRIBE = (1 << 0), - RTSP_ANNOUNCE = (1 << 1), - RTSP_GET_PARAMETER = (1 << 2), - RTSP_OPTIONS = (1 << 3), - RTSP_PAUSE = (1 << 4), - RTSP_PLAY = (1 << 5), - RTSP_RECORD = (1 << 6), - RTSP_REDIRECT = (1 << 7), - RTSP_SETUP = (1 << 8), - RTSP_SET_PARAMETER = (1 << 9), - RTSP_TEARDOWN = (1 << 10), + RTSP_DESCRIBE = (1 << 0), + RTSP_ANNOUNCE = (1 << 1), + RTSP_GET_PARAMETER = (1 << 2), + RTSP_OPTIONS = (1 << 3), + RTSP_PAUSE = (1 << 4), + RTSP_PLAY = (1 << 5), + RTSP_RECORD = (1 << 6), + RTSP_REDIRECT = (1 << 7), + RTSP_SETUP = (1 << 8), + RTSP_SET_PARAMETER = (1 << 9), + RTSP_TEARDOWN = (1 << 10), } RTSPMethod; typedef enum { @@ -74,102 +74,102 @@ typedef enum { * g = general * e = entity */ - RTSP_HDR_ACCEPT, /* Accept R opt. entity */ - RTSP_HDR_ACCEPT_ENCODING, /* Accept-Encoding R opt. entity */ - RTSP_HDR_ACCEPT_LANGUAGE, /* Accept-Language R opt. all */ - RTSP_HDR_ALLOW, /* Allow r opt. all */ - RTSP_HDR_AUTHORIZATION, /* Authorization R opt. all */ - RTSP_HDR_BANDWIDTH, /* Bandwidth R opt. all */ - RTSP_HDR_BLOCKSIZE, /* Blocksize R opt. all but OPTIONS, TEARDOWN */ - RTSP_HDR_CACHE_CONTROL, /* Cache-Control g opt. SETUP */ - RTSP_HDR_CONFERENCE, /* Conference R opt. SETUP */ - RTSP_HDR_CONNECTION, /* Connection g req. all */ - RTSP_HDR_CONTENT_BASE, /* Content-Base e opt. entity */ - RTSP_HDR_CONTENT_ENCODING, /* Content-Encoding e req. SET_PARAMETER, DESCRIBE, ANNOUNCE */ - RTSP_HDR_CONTENT_LANGUAGE, /* Content-Language e req. DESCRIBE, ANNOUNCE */ - RTSP_HDR_CONTENT_LENGTH, /* Content-Length e req. SET_PARAMETER, ANNOUNCE, entity */ - RTSP_HDR_CONTENT_LOCATION, /* Content-Location e opt. entity */ - RTSP_HDR_CONTENT_TYPE, /* Content-Type e req. SET_PARAMETER, ANNOUNCE, entity */ - RTSP_HDR_CSEQ, /* CSeq g req. all */ - RTSP_HDR_DATE, /* Date g opt. all */ - RTSP_HDR_EXPIRES, /* Expires e opt. DESCRIBE, ANNOUNCE */ - RTSP_HDR_FROM, /* From R opt. all */ - RTSP_HDR_IF_MODIFIED_SINCE, /* If-Modified-Since R opt. DESCRIBE, SETUP */ - RTSP_HDR_LAST_MODIFIED, /* Last-Modified e opt. entity */ - RTSP_HDR_PROXY_AUTHENTICATE, /* Proxy-Authenticate */ - RTSP_HDR_PROXY_REQUIRE, /* Proxy-Require R req. all */ - RTSP_HDR_PUBLIC, /* Public r opt. all */ - RTSP_HDR_RANGE, /* Range Rr opt. PLAY, PAUSE, RECORD */ - RTSP_HDR_REFERER, /* Referer R opt. all */ - RTSP_HDR_REQUIRE, /* Require R req. all */ - RTSP_HDR_RETRY_AFTER, /* Retry-After r opt. all */ - RTSP_HDR_RTP_INFO, /* RTP-Info r req. PLAY */ - RTSP_HDR_SCALE, /* Scale Rr opt. PLAY, RECORD */ - RTSP_HDR_SESSION, /* Session Rr req. all but SETUP, OPTIONS */ - RTSP_HDR_SERVER, /* Server r opt. all */ - RTSP_HDR_SPEED, /* Speed Rr opt. PLAY */ - RTSP_HDR_TRANSPORT, /* Transport Rr req. SETUP */ - RTSP_HDR_UNSUPPORTED, /* Unsupported r req. all */ - RTSP_HDR_USER_AGENT, /* User-Agent R opt. all */ - RTSP_HDR_VIA, /* Via g opt. all */ - RTSP_HDR_WWW_AUTHENTICATE, /* WWW-Authenticate r opt. all */ + RTSP_HDR_ACCEPT, /* Accept R opt. entity */ + RTSP_HDR_ACCEPT_ENCODING, /* Accept-Encoding R opt. entity */ + RTSP_HDR_ACCEPT_LANGUAGE, /* Accept-Language R opt. all */ + RTSP_HDR_ALLOW, /* Allow r opt. all */ + RTSP_HDR_AUTHORIZATION, /* Authorization R opt. all */ + RTSP_HDR_BANDWIDTH, /* Bandwidth R opt. all */ + RTSP_HDR_BLOCKSIZE, /* Blocksize R opt. all but OPTIONS, TEARDOWN */ + RTSP_HDR_CACHE_CONTROL, /* Cache-Control g opt. SETUP */ + RTSP_HDR_CONFERENCE, /* Conference R opt. SETUP */ + RTSP_HDR_CONNECTION, /* Connection g req. all */ + RTSP_HDR_CONTENT_BASE, /* Content-Base e opt. entity */ + RTSP_HDR_CONTENT_ENCODING, /* Content-Encoding e req. SET_PARAMETER, DESCRIBE, ANNOUNCE */ + RTSP_HDR_CONTENT_LANGUAGE, /* Content-Language e req. DESCRIBE, ANNOUNCE */ + RTSP_HDR_CONTENT_LENGTH, /* Content-Length e req. SET_PARAMETER, ANNOUNCE, entity */ + RTSP_HDR_CONTENT_LOCATION, /* Content-Location e opt. entity */ + RTSP_HDR_CONTENT_TYPE, /* Content-Type e req. SET_PARAMETER, ANNOUNCE, entity */ + RTSP_HDR_CSEQ, /* CSeq g req. all */ + RTSP_HDR_DATE, /* Date g opt. all */ + RTSP_HDR_EXPIRES, /* Expires e opt. DESCRIBE, ANNOUNCE */ + RTSP_HDR_FROM, /* From R opt. all */ + RTSP_HDR_IF_MODIFIED_SINCE, /* If-Modified-Since R opt. DESCRIBE, SETUP */ + RTSP_HDR_LAST_MODIFIED, /* Last-Modified e opt. entity */ + RTSP_HDR_PROXY_AUTHENTICATE, /* Proxy-Authenticate */ + RTSP_HDR_PROXY_REQUIRE, /* Proxy-Require R req. all */ + RTSP_HDR_PUBLIC, /* Public r opt. all */ + RTSP_HDR_RANGE, /* Range Rr opt. PLAY, PAUSE, RECORD */ + RTSP_HDR_REFERER, /* Referer R opt. all */ + RTSP_HDR_REQUIRE, /* Require R req. all */ + RTSP_HDR_RETRY_AFTER, /* Retry-After r opt. all */ + RTSP_HDR_RTP_INFO, /* RTP-Info r req. PLAY */ + RTSP_HDR_SCALE, /* Scale Rr opt. PLAY, RECORD */ + RTSP_HDR_SESSION, /* Session Rr req. all but SETUP, OPTIONS */ + RTSP_HDR_SERVER, /* Server r opt. all */ + RTSP_HDR_SPEED, /* Speed Rr opt. PLAY */ + RTSP_HDR_TRANSPORT, /* Transport Rr req. SETUP */ + RTSP_HDR_UNSUPPORTED, /* Unsupported r req. all */ + RTSP_HDR_USER_AGENT, /* User-Agent R opt. all */ + RTSP_HDR_VIA, /* Via g opt. all */ + RTSP_HDR_WWW_AUTHENTICATE, /* WWW-Authenticate r opt. all */ } RTSPHeaderField; typedef enum { - RTSP_STS_CONTINUE = 100, - RTSP_STS_OK = 200, - RTSP_STS_CREATED = 201, - RTSP_STS_LOW_ON_STORAGE = 250, - RTSP_STS_MULTIPLE_CHOICES = 300, - RTSP_STS_MOVED_PERMANENTLY = 301, - RTSP_STS_MOVE_TEMPORARILY = 302, - RTSP_STS_SEE_OTHER = 303, - RTSP_STS_NOT_MODIFIED = 304, - RTSP_STS_USE_PROXY = 305, - RTSP_STS_BAD_REQUEST = 400, - RTSP_STS_UNAUTHORIZED = 401, - RTSP_STS_PAYMENT_REQUIRED = 402, - RTSP_STS_FORBIDDEN = 403, - RTSP_STS_NOT_FOUND = 404, - RTSP_STS_METHOD_NOT_ALLOWED = 405, - RTSP_STS_NOT_ACCEPTABLE = 406, - RTSP_STS_PROXY_AUTH_REQUIRED = 407, - RTSP_STS_REQUEST_TIMEOUT = 408, - RTSP_STS_GONE = 410, - RTSP_STS_LENGTH_REQUIRED = 411, - RTSP_STS_PRECONDITION_FAILED = 412, - RTSP_STS_REQUEST_ENTITY_TOO_LARGE = 413, - RTSP_STS_REQUEST_URI_TOO_LARGE = 414, - RTSP_STS_UNSUPPORTED_MEDIA_TYPE = 415, - RTSP_STS_PARAMETER_NOT_UNDERSTOOD = 451, - RTSP_STS_CONFERENCE_NOT_FOUND = 452, - RTSP_STS_NOT_ENOUGH_BANDWIDTH = 453, - RTSP_STS_SESSION_NOT_FOUND = 454, - RTSP_STS_METHOD_NOT_VALID_IN_THIS_STATE = 455, - RTSP_STS_HEADER_FIELD_NOT_VALID_FOR_RESOURCE = 456, - RTSP_STS_INVALID_RANGE = 457, - RTSP_STS_PARAMETER_IS_READONLY = 458, - RTSP_STS_AGGREGATE_OPERATION_NOT_ALLOWED = 459, - RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED = 460, - RTSP_STS_UNSUPPORTED_TRANSPORT = 461, - RTSP_STS_DESTINATION_UNREACHABLE = 462, - RTSP_STS_INTERNAL_SERVER_ERROR = 500, - RTSP_STS_NOT_IMPLEMENTED = 501, - RTSP_STS_BAD_GATEWAY = 502, - RTSP_STS_SERVICE_UNAVAILABLE = 503, - RTSP_STS_GATEWAY_TIMEOUT = 504, - RTSP_STS_RTSP_VERSION_NOT_SUPPORTED = 505, - RTSP_STS_OPTION_NOT_SUPPORTED = 551, + RTSP_STS_CONTINUE = 100, + RTSP_STS_OK = 200, + RTSP_STS_CREATED = 201, + RTSP_STS_LOW_ON_STORAGE = 250, + RTSP_STS_MULTIPLE_CHOICES = 300, + RTSP_STS_MOVED_PERMANENTLY = 301, + RTSP_STS_MOVE_TEMPORARILY = 302, + RTSP_STS_SEE_OTHER = 303, + RTSP_STS_NOT_MODIFIED = 304, + RTSP_STS_USE_PROXY = 305, + RTSP_STS_BAD_REQUEST = 400, + RTSP_STS_UNAUTHORIZED = 401, + RTSP_STS_PAYMENT_REQUIRED = 402, + RTSP_STS_FORBIDDEN = 403, + RTSP_STS_NOT_FOUND = 404, + RTSP_STS_METHOD_NOT_ALLOWED = 405, + RTSP_STS_NOT_ACCEPTABLE = 406, + RTSP_STS_PROXY_AUTH_REQUIRED = 407, + RTSP_STS_REQUEST_TIMEOUT = 408, + RTSP_STS_GONE = 410, + RTSP_STS_LENGTH_REQUIRED = 411, + RTSP_STS_PRECONDITION_FAILED = 412, + RTSP_STS_REQUEST_ENTITY_TOO_LARGE = 413, + RTSP_STS_REQUEST_URI_TOO_LARGE = 414, + RTSP_STS_UNSUPPORTED_MEDIA_TYPE = 415, + RTSP_STS_PARAMETER_NOT_UNDERSTOOD = 451, + RTSP_STS_CONFERENCE_NOT_FOUND = 452, + RTSP_STS_NOT_ENOUGH_BANDWIDTH = 453, + RTSP_STS_SESSION_NOT_FOUND = 454, + RTSP_STS_METHOD_NOT_VALID_IN_THIS_STATE = 455, + RTSP_STS_HEADER_FIELD_NOT_VALID_FOR_RESOURCE = 456, + RTSP_STS_INVALID_RANGE = 457, + RTSP_STS_PARAMETER_IS_READONLY = 458, + RTSP_STS_AGGREGATE_OPERATION_NOT_ALLOWED = 459, + RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED = 460, + RTSP_STS_UNSUPPORTED_TRANSPORT = 461, + RTSP_STS_DESTINATION_UNREACHABLE = 462, + RTSP_STS_INTERNAL_SERVER_ERROR = 500, + RTSP_STS_NOT_IMPLEMENTED = 501, + RTSP_STS_BAD_GATEWAY = 502, + RTSP_STS_SERVICE_UNAVAILABLE = 503, + RTSP_STS_GATEWAY_TIMEOUT = 504, + RTSP_STS_RTSP_VERSION_NOT_SUPPORTED = 505, + RTSP_STS_OPTION_NOT_SUPPORTED = 551, } RTSPStatusCode; -const gchar* rtsp_method_as_text (RTSPMethod method); -const gchar* rtsp_header_as_text (RTSPHeaderField field); -const gchar* rtsp_status_as_text (RTSPStatusCode code); -const gchar* rtsp_status_to_string (RTSPStatusCode code); +const gchar* rtsp_method_as_text (RTSPMethod method); +const gchar* rtsp_header_as_text (RTSPHeaderField field); +const gchar* rtsp_status_as_text (RTSPStatusCode code); +const gchar* rtsp_status_to_string (RTSPStatusCode code); -RTSPHeaderField rtsp_find_header_field (gchar *header); -RTSPMethod rtsp_find_method (gchar *method); +RTSPHeaderField rtsp_find_header_field (gchar *header); +RTSPMethod rtsp_find_method (gchar *method); G_END_DECLS diff --git a/gst/rtsp/rtspmessage.h b/gst/rtsp/rtspmessage.h index 60adb70c..154ed287 100644 --- a/gst/rtsp/rtspmessage.h +++ b/gst/rtsp/rtspmessage.h @@ -35,50 +35,50 @@ typedef enum typedef struct _RTSPMessage { - RTSPMsgType type; + RTSPMsgType type; union { struct { - RTSPMethod method; - gchar *uri; + RTSPMethod method; + gchar *uri; } request; struct { - RTSPStatusCode code; - gchar *reason; + RTSPStatusCode code; + gchar *reason; } response; struct { - gint channel; + gint channel; } data; } type_data; GHashTable *hdr_fields; - guint8 *body; - guint body_size; + guint8 *body; + guint body_size; } RTSPMessage; -RTSPResult rtsp_message_new_request (RTSPMethod method, gchar *uri, RTSPMessage **msg); -RTSPResult rtsp_message_init_request (RTSPMethod method, gchar *uri, RTSPMessage *msg); +RTSPResult rtsp_message_new_request (RTSPMethod method, gchar *uri, RTSPMessage **msg); +RTSPResult rtsp_message_init_request (RTSPMethod method, gchar *uri, RTSPMessage *msg); -RTSPResult rtsp_message_new_response (RTSPStatusCode code, gchar *reason, - RTSPMessage *request, RTSPMessage **msg); -RTSPResult rtsp_message_init_response (RTSPStatusCode code, gchar *reason, - RTSPMessage *request, RTSPMessage *msg); -RTSPResult rtsp_message_init_data (gint channel, RTSPMessage *msg); +RTSPResult rtsp_message_new_response (RTSPStatusCode code, gchar *reason, + RTSPMessage *request, RTSPMessage **msg); +RTSPResult rtsp_message_init_response (RTSPStatusCode code, gchar *reason, + RTSPMessage *request, RTSPMessage *msg); +RTSPResult rtsp_message_init_data (gint channel, RTSPMessage *msg); -RTSPResult rtsp_message_free (RTSPMessage *msg); +RTSPResult rtsp_message_free (RTSPMessage *msg); -RTSPResult rtsp_message_add_header (RTSPMessage *msg, RTSPHeaderField field, gchar *value); -RTSPResult rtsp_message_remove_header (RTSPMessage *msg, RTSPHeaderField field); -RTSPResult rtsp_message_get_header (RTSPMessage *msg, RTSPHeaderField field, gchar **value); +RTSPResult rtsp_message_add_header (RTSPMessage *msg, RTSPHeaderField field, gchar *value); +RTSPResult rtsp_message_remove_header (RTSPMessage *msg, RTSPHeaderField field); +RTSPResult rtsp_message_get_header (RTSPMessage *msg, RTSPHeaderField field, gchar **value); -RTSPResult rtsp_message_set_body (RTSPMessage *msg, guint8 *data, guint size); -RTSPResult rtsp_message_take_body (RTSPMessage *msg, guint8 *data, guint size); -RTSPResult rtsp_message_get_body (RTSPMessage *msg, guint8 **data, guint *size); +RTSPResult rtsp_message_set_body (RTSPMessage *msg, guint8 *data, guint size); +RTSPResult rtsp_message_take_body (RTSPMessage *msg, guint8 *data, guint size); +RTSPResult rtsp_message_get_body (RTSPMessage *msg, guint8 **data, guint *size); -RTSPResult rtsp_message_dump (RTSPMessage *msg); +RTSPResult rtsp_message_dump (RTSPMessage *msg); G_END_DECLS diff --git a/gst/rtsp/rtsptransport.h b/gst/rtsp/rtsptransport.h index 288275fb..e746f501 100644 --- a/gst/rtsp/rtsptransport.h +++ b/gst/rtsp/rtsptransport.h @@ -45,34 +45,34 @@ typedef struct } RTSPRange; typedef struct _RTSPTransport { - RTSPTransMode trans; + RTSPTransMode trans; RTSPProfile profile; RTSPLowerTrans lower_transport; - gboolean multicast; - gchar *destination; - gchar *source; - gint layers; - gboolean mode_play; - gboolean mode_record; - gboolean append; - RTSPRange interleaved; + gboolean multicast; + gchar *destination; + gchar *source; + gint layers; + gboolean mode_play; + gboolean mode_record; + gboolean append; + RTSPRange interleaved; /* mulitcast specific */ - gint ttl; + gint ttl; /* RTP specific */ - RTSPRange port; - RTSPRange client_port; - RTSPRange server_port; - gchar *ssrc; + RTSPRange port; + RTSPRange client_port; + RTSPRange server_port; + gchar *ssrc; } RTSPTransport; RTSPResult rtsp_transport_new (RTSPTransport **transport); RTSPResult rtsp_transport_init (RTSPTransport *transport); -RTSPResult rtsp_transport_parse (gchar *str, RTSPTransport *transport); +RTSPResult rtsp_transport_parse (gchar *str, RTSPTransport *transport); RTSPResult rtsp_transport_free (RTSPTransport *transport); diff --git a/gst/rtsp/rtspurl.c b/gst/rtsp/rtspurl.c index 7f58cb45..da7a8795 100644 --- a/gst/rtsp/rtspurl.c +++ b/gst/rtsp/rtspurl.c @@ -21,10 +21,10 @@ #include "rtspurl.h" -#define RTSP_PROTO "rtsp://" -#define RTSP_PROTO_LEN 7 -#define RTSPU_PROTO "rtspu://" -#define RTSPU_PROTO_LEN 8 +#define RTSP_PROTO "rtsp://" +#define RTSP_PROTO_LEN 7 +#define RTSPU_PROTO "rtspu://" +#define RTSPU_PROTO_LEN 8 /* format is rtsp[u]://[user:passwd@]host[:port]/abspath */ diff --git a/gst/rtsp/rtspurl.h b/gst/rtsp/rtspurl.h index 2492b87b..1fae3003 100644 --- a/gst/rtsp/rtspurl.h +++ b/gst/rtsp/rtspurl.h @@ -26,7 +26,7 @@ G_BEGIN_DECLS -#define RTSP_DEFAULT_PORT 554 +#define RTSP_DEFAULT_PORT 554 typedef struct _RTSPUrl { RTSPProto protocol; @@ -38,8 +38,8 @@ typedef struct _RTSPUrl { gchar *abspath; } RTSPUrl; -RTSPResult rtsp_url_parse (const gchar *urlstr, RTSPUrl **url); -void rtsp_url_free (RTSPUrl *url); +RTSPResult rtsp_url_parse (const gchar *urlstr, RTSPUrl **url); +void rtsp_url_free (RTSPUrl *url); G_END_DECLS diff --git a/gst/rtsp/sdpmessage.c b/gst/rtsp/sdpmessage.c index 76dd73d7..5ab9b85f 100644 --- a/gst/rtsp/sdpmessage.c +++ b/gst/rtsp/sdpmessage.c @@ -22,51 +22,51 @@ #include "sdpmessage.h" -#define FREE_STRING(field) g_free ((field)); (field) = NULL; -#define FREE_ARRAY(field) \ -G_STMT_START { \ - if (field) \ - g_array_free (field, TRUE); \ - field = NULL; \ +#define FREE_STRING(field) g_free ((field)); (field) = NULL; +#define FREE_ARRAY(field) \ +G_STMT_START { \ + if (field) \ + g_array_free (field, TRUE); \ + field = NULL; \ } G_STMT_END -#define REPLACE_STRING(field,val) FREE_STRING(field);field=g_strdup (val); - -#define INIT_ARRAY(field,type) \ -G_STMT_START { \ - if (field) \ - g_array_set_size (field,0); \ - else \ - field = g_array_new (FALSE, TRUE, sizeof(type)); \ +#define REPLACE_STRING(field,val) FREE_STRING(field);field=g_strdup (val); + +#define INIT_ARRAY(field,type) \ +G_STMT_START { \ + if (field) \ + g_array_set_size (field,0); \ + else \ + field = g_array_new (FALSE, TRUE, sizeof(type)); \ } G_STMT_END -#define DEFINE_STRING_SETTER(field) \ -RTSPResult sdp_message_set_##field (SDPMessage *msg, gchar *val) { \ - g_free (msg->field); \ - msg->field = g_strdup (val); \ - return RTSP_OK; \ +#define DEFINE_STRING_SETTER(field) \ +RTSPResult sdp_message_set_##field (SDPMessage *msg, gchar *val) { \ + g_free (msg->field); \ + msg->field = g_strdup (val); \ + return RTSP_OK; \ } -#define DEFINE_STRING_GETTER(field) \ -char* sdp_message_get_##field (SDPMessage *msg) { \ - return msg->field; \ +#define DEFINE_STRING_GETTER(field) \ +char* sdp_message_get_##field (SDPMessage *msg) { \ + return msg->field; \ } -#define DEFINE_ARRAY_LEN(field) \ -gint sdp_message_##field##_len (SDPMessage *msg) { \ - return ((msg)->field->len); \ +#define DEFINE_ARRAY_LEN(field) \ +gint sdp_message_##field##_len (SDPMessage *msg) { \ + return ((msg)->field->len); \ } -#define DEFINE_ARRAY_GETTER(method,field,type) \ -type sdp_message_get_##method (SDPMessage *msg, gint i) { \ - return g_array_index ((msg)->field, type, i); \ +#define DEFINE_ARRAY_GETTER(method,field,type) \ +type sdp_message_get_##method (SDPMessage *msg, gint i) { \ + return g_array_index ((msg)->field, type, i); \ } -#define DEFINE_ARRAY_P_GETTER(method,field,type) \ -type * sdp_message_get_##method (SDPMessage *msg, gint i) { \ - return &g_array_index ((msg)->field, type, i); \ +#define DEFINE_ARRAY_P_GETTER(method,field,type) \ +type * sdp_message_get_##method (SDPMessage *msg, gint i) { \ + return &g_array_index ((msg)->field, type, i); \ } -#define DEFINE_ARRAY_ADDER(method,field,type,dup_method) \ -RTSPResult sdp_message_add_##method (SDPMessage *msg, type val) { \ - type v = dup_method(val); \ - g_array_append_val((msg)->field, v); \ - return RTSP_OK; \ +#define DEFINE_ARRAY_ADDER(method,field,type,dup_method) \ +RTSPResult sdp_message_add_##method (SDPMessage *msg, type val) { \ + type v = dup_method(val); \ + g_array_append_val((msg)->field, v); \ + return RTSP_OK; \ } diff --git a/gst/rtsp/sdpmessage.h b/gst/rtsp/sdpmessage.h index 450bdced..e50a9ee9 100644 --- a/gst/rtsp/sdpmessage.h +++ b/gst/rtsp/sdpmessage.h @@ -71,94 +71,94 @@ typedef struct { } SDPAttribute; typedef struct { - gchar *media; - gint port; - gint num_ports; - gchar *proto; - GArray *fmts; - gchar *information; - GArray *connections; - GArray *bandwidths; - SDPKey key; - GArray *attributes; + gchar *media; + gint port; + gint num_ports; + gchar *proto; + GArray *fmts; + gchar *information; + GArray *connections; + GArray *bandwidths; + SDPKey key; + GArray *attributes; } SDPMedia; typedef struct { - gchar *version; - SDPOrigin origin; - gchar *session_name; - gchar *information; - gchar *uri; - GArray *emails; - GArray *phones; + gchar *version; + SDPOrigin origin; + gchar *session_name; + gchar *information; + gchar *uri; + GArray *emails; + GArray *phones; SDPConnection connection; - GArray *bandwidths; - GArray *times; - GArray *zones; - SDPKey key; - GArray *attributes; - GArray *medias; + GArray *bandwidths; + GArray *times; + GArray *zones; + SDPKey key; + GArray *attributes; + GArray *medias; } SDPMessage; /* Session descriptions */ -RTSPResult sdp_message_new (SDPMessage **msg); -RTSPResult sdp_message_init (SDPMessage *msg); -RTSPResult sdp_message_clean (SDPMessage *msg); -RTSPResult sdp_message_free (SDPMessage *msg); - -RTSPResult sdp_message_parse_buffer (guint8 *data, guint size, SDPMessage *msg); - -RTSPResult sdp_message_set_version (SDPMessage *msg, gchar *version); -gchar* sdp_message_get_version (SDPMessage *msg); -RTSPResult sdp_message_set_origin (SDPMessage *msg, gchar *username, gchar *sess_id, - gchar *sess_version, gchar *nettype, - gchar *addrtype, gchar *addr); -SDPOrigin* sdp_message_get_origin (SDPMessage *msg); -RTSPResult sdp_message_set_session_name (SDPMessage *msg, gchar *session_name); -gchar* sdp_message_get_session_name (SDPMessage *msg); -RTSPResult sdp_message_set_information (SDPMessage *msg, gchar *information); -gchar* sdp_message_get_information (SDPMessage *msg); -RTSPResult sdp_message_set_uri (SDPMessage *msg, gchar *uri); -gchar* sdp_message_get_uri (SDPMessage *msg); -gint sdp_message_emails_len (SDPMessage *msg); -gchar* sdp_message_get_email (SDPMessage *msg, gint i); -RTSPResult sdp_message_add_email (SDPMessage *msg, gchar *email); -gint sdp_message_phones_len (SDPMessage *msg); -gchar* sdp_message_get_phone (SDPMessage *msg, gint i); -RTSPResult sdp_message_add_phone (SDPMessage *msg, gchar *phone); -RTSPResult sdp_message_set_connection (SDPMessage *msg, gchar *nettype, gchar *addrtype, - gchar *address, gint ttl, gint addr_number); -SDPConnection* sdp_message_get_connection (SDPMessage *msg); -gint sdp_message_bandwidths_len (SDPMessage *msg); -SDPBandwidth* sdp_message_get_bandwidth (SDPMessage *msg, gint i); -RTSPResult sdp_message_add_bandwidth (SDPMessage *msg, gchar *bwtype, gint bandwidth); -gint sdp_message_times_len (SDPMessage *msg); -SDPTime* sdp_message_get_time (SDPMessage *msg, gint i); -RTSPResult sdp_message_add_time (SDPMessage *msg, gchar *time); -gint sdp_message_zones_len (SDPMessage *msg); -SDPZone* sdp_message_get_zone (SDPMessage *msg, gint i); -RTSPResult sdp_message_add_zone (SDPMessage *msg, gchar *time, gchar *typed_time); -RTSPResult sdp_message_set_key (SDPMessage *msg, gchar *type, gchar *data); -SDPKey* sdp_message_get_key (SDPMessage *msg); -gint sdp_message_attributes_len (SDPMessage *msg); -SDPAttribute* sdp_message_get_attribute (SDPMessage *msg, gint i); -gchar* sdp_message_get_attribute_val (SDPMessage *msg, gchar *key); -RTSPResult sdp_message_add_attribute (SDPMessage *msg, gchar *key, gchar *value); -gint sdp_message_medias_len (SDPMessage *msg); -SDPMedia* sdp_message_get_media (SDPMessage *msg, gint i); -RTSPResult sdp_message_add_media (SDPMessage *msg, SDPMedia *media); - - -RTSPResult sdp_message_dump (SDPMessage *msg); +RTSPResult sdp_message_new (SDPMessage **msg); +RTSPResult sdp_message_init (SDPMessage *msg); +RTSPResult sdp_message_clean (SDPMessage *msg); +RTSPResult sdp_message_free (SDPMessage *msg); + +RTSPResult sdp_message_parse_buffer (guint8 *data, guint size, SDPMessage *msg); + +RTSPResult sdp_message_set_version (SDPMessage *msg, gchar *version); +gchar* sdp_message_get_version (SDPMessage *msg); +RTSPResult sdp_message_set_origin (SDPMessage *msg, gchar *username, gchar *sess_id, + gchar *sess_version, gchar *nettype, + gchar *addrtype, gchar *addr); +SDPOrigin* sdp_message_get_origin (SDPMessage *msg); +RTSPResult sdp_message_set_session_name (SDPMessage *msg, gchar *session_name); +gchar* sdp_message_get_session_name (SDPMessage *msg); +RTSPResult sdp_message_set_information (SDPMessage *msg, gchar *information); +gchar* sdp_message_get_information (SDPMessage *msg); +RTSPResult sdp_message_set_uri (SDPMessage *msg, gchar *uri); +gchar* sdp_message_get_uri (SDPMessage *msg); +gint sdp_message_emails_len (SDPMessage *msg); +gchar* sdp_message_get_email (SDPMessage *msg, gint i); +RTSPResult sdp_message_add_email (SDPMessage *msg, gchar *email); +gint sdp_message_phones_len (SDPMessage *msg); +gchar* sdp_message_get_phone (SDPMessage *msg, gint i); +RTSPResult sdp_message_add_phone (SDPMessage *msg, gchar *phone); +RTSPResult sdp_message_set_connection (SDPMessage *msg, gchar *nettype, gchar *addrtype, + gchar *address, gint ttl, gint addr_number); +SDPConnection* sdp_message_get_connection (SDPMessage *msg); +gint sdp_message_bandwidths_len (SDPMessage *msg); +SDPBandwidth* sdp_message_get_bandwidth (SDPMessage *msg, gint i); +RTSPResult sdp_message_add_bandwidth (SDPMessage *msg, gchar *bwtype, gint bandwidth); +gint sdp_message_times_len (SDPMessage *msg); +SDPTime* sdp_message_get_time (SDPMessage *msg, gint i); +RTSPResult sdp_message_add_time (SDPMessage *msg, gchar *time); +gint sdp_message_zones_len (SDPMessage *msg); +SDPZone* sdp_message_get_zone (SDPMessage *msg, gint i); +RTSPResult sdp_message_add_zone (SDPMessage *msg, gchar *time, gchar *typed_time); +RTSPResult sdp_message_set_key (SDPMessage *msg, gchar *type, gchar *data); +SDPKey* sdp_message_get_key (SDPMessage *msg); +gint sdp_message_attributes_len (SDPMessage *msg); +SDPAttribute* sdp_message_get_attribute (SDPMessage *msg, gint i); +gchar* sdp_message_get_attribute_val (SDPMessage *msg, gchar *key); +RTSPResult sdp_message_add_attribute (SDPMessage *msg, gchar *key, gchar *value); +gint sdp_message_medias_len (SDPMessage *msg); +SDPMedia* sdp_message_get_media (SDPMessage *msg, gint i); +RTSPResult sdp_message_add_media (SDPMessage *msg, SDPMedia *media); + + +RTSPResult sdp_message_dump (SDPMessage *msg); /* Media descriptions */ -RTSPResult sdp_media_new (SDPMedia **media); -RTSPResult sdp_media_init (SDPMedia *media); -RTSPResult sdp_media_clean (SDPMedia *media); -RTSPResult sdp_media_free (SDPMedia *media); +RTSPResult sdp_media_new (SDPMedia **media); +RTSPResult sdp_media_init (SDPMedia *media); +RTSPResult sdp_media_clean (SDPMedia *media); +RTSPResult sdp_media_free (SDPMedia *media); -gchar* sdp_media_get_attribute_val (SDPMedia *media, gchar *key); -gchar* sdp_media_get_format (SDPMedia *media, gint i); +gchar* sdp_media_get_attribute_val (SDPMedia *media, gchar *key); +gchar* sdp_media_get_format (SDPMedia *media, gint i); G_END_DECLS |