mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 00:32:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspsrc: wrap gst_rtsp_message_init_request in a local function

Browse source 
This will allow adding common request initialization, like the
user agent string, in just one place.
This commit is contained in:
George Kiagiadakis 2015-08-14 15:42:42 +02:00
parent 0671ea85af
commit af03341e26
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/rtsp/gstrtspsrc.c
View file

@ -4567,6 +4567,21 @@ gst_rtspsrc_connection_flush (GstRTSPSrc * src, gboolean flush)
GST_RTSP_STATE_UNLOCK (src); GST_RTSP_STATE_UNLOCK (src);
} }
static GstRTSPResult
gst_rtspsrc_init_request (GstRTSPSrc * src, GstRTSPMessage * msg,
GstRTSPMethod method, const gchar * uri)
{
GstRTSPResult res;
res = gst_rtsp_message_init_request (msg, method, uri);
if (res < 0)
return res;
/* TODO add common initialization here */
return res;
}
/* FIXME, handle server request, reply with OK, for now */ /* FIXME, handle server request, reply with OK, for now */
static GstRTSPResult static GstRTSPResult
gst_rtspsrc_handle_request (GstRTSPSrc * src, GstRTSPConnection * conn, gst_rtspsrc_handle_request (GstRTSPSrc * src, GstRTSPConnection * conn,
@ -4643,7 +4658,7 @@ gst_rtspsrc_send_keep_alive (GstRTSPSrc * src)
if (control == NULL) if (control == NULL)
goto no_control; goto no_control;
res = gst_rtsp_message_init_request (&request, method, control); res = gst_rtspsrc_init_request (src, &request, method, control);
if (res < 0) if (res < 0)
goto send_error; goto send_error;
@ -6580,7 +6595,7 @@ gst_rtspsrc_setup_streams (GstRTSPSrc * src, gboolean async)
/* create SETUP request */ /* create SETUP request */
res = res =
gst_rtsp_message_init_request (&request, GST_RTSP_SETUP, gst_rtspsrc_init_request (src, &request, GST_RTSP_SETUP,
stream->conninfo.location); stream->conninfo.location);
if (res < 0) { if (res < 0) {
g_free (transports); g_free (transports);
@ -7117,7 +7132,7 @@ restart:
/* create OPTIONS */ /* create OPTIONS */
GST_DEBUG_OBJECT (src, "create options..."); GST_DEBUG_OBJECT (src, "create options...");
res = res =
gst_rtsp_message_init_request (&request, GST_RTSP_OPTIONS, gst_rtspsrc_init_request (src, &request, GST_RTSP_OPTIONS,
src->conninfo.url_str); src->conninfo.url_str);
if (res < 0) if (res < 0)
goto create_request_failed; goto create_request_failed;
@ -7140,7 +7155,7 @@ restart:
/* create DESCRIBE */ /* create DESCRIBE */
GST_DEBUG_OBJECT (src, "create describe..."); GST_DEBUG_OBJECT (src, "create describe...");
res = res =
gst_rtsp_message_init_request (&request, GST_RTSP_DESCRIBE, gst_rtspsrc_init_request (src, &request, GST_RTSP_DESCRIBE,
src->conninfo.url_str); src->conninfo.url_str);
if (res < 0) if (res < 0)
goto create_request_failed; goto create_request_failed;
@ -7356,7 +7371,7 @@ gst_rtspsrc_close (GstRTSPSrc * src, gboolean async, gboolean only_close)
/* do TEARDOWN */ /* do TEARDOWN */
res = res =
gst_rtsp_message_init_request (&request, GST_RTSP_TEARDOWN, setup_url); gst_rtspsrc_init_request (src, &request, GST_RTSP_TEARDOWN, setup_url);
if (res < 0) if (res < 0)
goto create_request_failed; goto create_request_failed;
@ -7670,7 +7685,7 @@ gst_rtspsrc_play (GstRTSPSrc * src, GstSegment * segment, gboolean async)
} }
/* do play */ /* do play */
res = gst_rtsp_message_init_request (&request, GST_RTSP_PLAY, setup_url); res = gst_rtspsrc_init_request (src, &request, GST_RTSP_PLAY, setup_url);
if (res < 0) if (res < 0)
goto create_request_failed; goto create_request_failed;
@ -7884,7 +7899,7 @@ gst_rtspsrc_pause (GstRTSPSrc * src, gboolean async)
("Sending PAUSE request")); ("Sending PAUSE request"));
if ((res = if ((res =
gst_rtsp_message_init_request (&request, GST_RTSP_PAUSE, gst_rtspsrc_init_request (src, &request, GST_RTSP_PAUSE,
setup_url)) < 0) setup_url)) < 0)
goto create_request_failed; goto create_request_failed;