summaryrefslogtreecommitdiffstats
path: root/gst/rtsp/sdpmessage.c
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2007-01-10 15:19:48 +0000
committerWim Taymans <wim.taymans@gmail.com>2007-01-10 15:19:48 +0000
commit12ab127d12bf2d5f15860e736bb1792918f532ef (patch)
tree85750eca3bb6457a12183b3d98d23f2de5301eba /gst/rtsp/sdpmessage.c
parent8f7c1775d9bc42cdaa84cd305718b09b80c27e95 (diff)
gst/rtsp/: Allow url to be NULL to be able to use it for server connections.
Original commit message from CVS: Patch by: Peter Kjellerstedt <pkj at axis com> * gst/rtsp/COPYING.MIT: * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_create_stream), (gst_rtspsrc_stream_free), (gst_rtspsrc_cleanup), (gst_rtspsrc_alloc_udp_ports), (pad_unblocked), (pad_blocked), (gst_rtspsrc_stream_configure_transport), (gst_rtspsrc_activate_streams), (gst_rtspsrc_loop_interleaved), (gst_rtspsrc_loop_udp), (gst_rtspsrc_send), (gst_rtspsrc_parse_methods), (gst_rtspsrc_create_transports_string), (gst_rtspsrc_prepare_transports), (gst_rtspsrc_setup_streams), (gst_rtspsrc_open), (gst_rtspsrc_close): * gst/rtsp/gstrtspsrc.h: * gst/rtsp/rtspconnection.c: (rtsp_connection_create), (rtsp_connection_connect), (rtsp_connection_send), (read_line), (parse_request_line), (parse_line), (rtsp_connection_read), (rtsp_connection_close): * gst/rtsp/rtspdefs.c: (rtsp_init_status), (rtsp_strresult), (rtsp_method_as_text), (rtsp_header_as_text), (rtsp_status_as_text), (rtsp_find_header_field), (rtsp_find_method): * gst/rtsp/rtspdefs.h: * gst/rtsp/rtspextwms.c: (rtsp_ext_wms_after_send), (rtsp_ext_wms_configure_stream): * gst/rtsp/rtspmessage.c: (rtsp_message_new), (rtsp_message_init), (rtsp_message_new_request), (rtsp_message_init_request), (rtsp_message_new_response), (rtsp_message_init_response), (rtsp_message_init_data), (rtsp_message_unset), (rtsp_message_free), (rtsp_message_add_header), (rtsp_message_get_header), (rtsp_message_set_body), (rtsp_message_get_body), (dump_mem), (rtsp_message_dump): * gst/rtsp/rtspmessage.h: * gst/rtsp/sdpmessage.c: (sdp_message_get_attribute_val_n), (sdp_media_get_attribute_val_n), (read_string), (read_string_del), (sdp_parse_line), (sdp_message_parse_buffer), (print_media), (sdp_message_dump): Allow url to be NULL to be able to use it for server connections. Can now send responses as well as requests. No longer hangs in an endless loop if EOF is received. Can now convert a status code to a text string. Return RTSP_HDR_INVALID for unknown headers. Return RTSP_INVALID for unknown methods. Copy CSeq and Session headers from the request. Only free memory corresponding to the currently set message type. Added const to function arguments as appropriate. Avoid a compiler warning when initializing nmedia. Use guint rather than gint to avoid compiler warnings. Fix crasher in wms extension. Factor out stream setup from open_connection. Delay activation of streams when actual data is received from the server, this prepares us to do proper protocol switching. Added new license. Fixes #380895.
Diffstat (limited to 'gst/rtsp/sdpmessage.c')
-rw-r--r--gst/rtsp/sdpmessage.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/gst/rtsp/sdpmessage.c b/gst/rtsp/sdpmessage.c
index a9430cf0..e7d2d7eb 100644
--- a/gst/rtsp/sdpmessage.c
+++ b/gst/rtsp/sdpmessage.c
@@ -322,7 +322,7 @@ DEFINE_ARRAY_P_GETTER (attribute, attributes, SDPAttribute);
gchar *
sdp_message_get_attribute_val_n (SDPMessage * msg, gchar * key, guint nth)
{
- gint i;
+ guint i;
for (i = 0; i < msg->attributes->len; i++) {
SDPAttribute *attr;
@@ -423,7 +423,7 @@ sdp_media_get_attribute (SDPMedia * media, guint idx)
gchar *
sdp_media_get_attribute_val_n (SDPMedia * media, gchar * key, guint nth)
{
- gint i;
+ guint i;
for (i = 0; i < media->attributes->len; i++) {
SDPAttribute *attr;
@@ -454,9 +454,9 @@ sdp_media_get_format (SDPMedia * media, guint idx)
}
static void
-read_string (gchar * dest, gint size, gchar ** src)
+read_string (gchar * dest, guint size, gchar ** src)
{
- gint idx;
+ guint idx;
idx = 0;
/* skip spaces */
@@ -473,9 +473,9 @@ read_string (gchar * dest, gint size, gchar ** src)
}
static void
-read_string_del (gchar * dest, gint size, gchar del, gchar ** src)
+read_string_del (gchar * dest, guint size, gchar del, gchar ** src)
{
- gint idx;
+ guint idx;
idx = 0;
/* skip spaces */
@@ -582,7 +582,7 @@ sdp_parse_line (SDPContext * c, gchar type, gchar * buffer)
case 'm':
{
gchar *slash;
- SDPMedia nmedia = { 0 };
+ SDPMedia nmedia = {.media = NULL };
c->state = SDP_MEDIA;
sdp_media_init (&nmedia);
@@ -622,7 +622,7 @@ sdp_message_parse_buffer (guint8 * data, guint size, SDPMessage * msg)
SDPContext c;
gchar type;
gchar buffer[MAX_LINE_LEN];
- gint idx = 0;
+ guint idx = 0;
g_return_val_if_fail (msg != NULL, RTSP_EINVAL);
g_return_val_if_fail (data != NULL, RTSP_EINVAL);
@@ -672,7 +672,7 @@ print_media (SDPMedia * media)
g_print (" num_ports: '%d'\n", media->num_ports);
g_print (" proto: '%s'\n", media->proto);
if (media->fmts->len > 0) {
- gint i;
+ guint i;
g_print (" formats:\n");
for (i = 0; i < media->fmts->len; i++) {
@@ -684,7 +684,7 @@ print_media (SDPMedia * media)
g_print (" type: '%s'\n", media->key.type);
g_print (" data: '%s'\n", media->key.data);
if (media->attributes->len > 0) {
- gint i;
+ guint i;
g_print (" attributes:\n");
for (i = 0; i < media->attributes->len; i++) {
@@ -714,7 +714,7 @@ sdp_message_dump (SDPMessage * msg)
g_print (" uri: '%s'\n", msg->uri);
if (msg->emails->len > 0) {
- gint i;
+ guint i;
g_print (" emails:\n");
for (i = 0; i < msg->emails->len; i++) {
@@ -722,7 +722,7 @@ sdp_message_dump (SDPMessage * msg)
}
}
if (msg->phones->len > 0) {
- gint i;
+ guint i;
g_print (" phones:\n");
for (i = 0; i < msg->phones->len; i++) {
@@ -739,7 +739,7 @@ sdp_message_dump (SDPMessage * msg)
g_print (" type: '%s'\n", msg->key.type);
g_print (" data: '%s'\n", msg->key.data);
if (msg->attributes->len > 0) {
- gint i;
+ guint i;
g_print (" attributes:\n");
for (i = 0; i < msg->attributes->len; i++) {
@@ -749,7 +749,7 @@ sdp_message_dump (SDPMessage * msg)
}
}
if (msg->medias->len > 0) {
- gint i;
+ guint i;
g_print (" medias:\n");
for (i = 0; i < msg->medias->len; i++) {