mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-media/client: Reply to PLAY request with same type of Range

Browse source 
Remember the type of Range from the PLAY request and use the same type for
the reply.
This commit is contained in:
Olivier Crête 2013-02-22 14:17:29 -05:00 committed by Wim Taymans
parent 8a08fddb41
commit c18eafbb24
6 changed files with 62 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/rtsp-server/rtsp-client.c
View file

@ -859,6 +859,7 @@ handle_play_request (GstRTSPClient * client, GstRTSPClientState * state)
GstRTSPTimeRange *range;
GstRTSPResult res;
GstRTSPState rtspstate;
GstRTSPRangeUnit unit = GST_RTSP_RANGE_NPT;
if (!(session = state->session))
goto no_session;
@ -882,6 +883,7 @@ handle_play_request (GstRTSPClient * client, GstRTSPClientState * state)
if (gst_rtsp_range_parse (str, &range) == GST_RTSP_OK) {
/* we have a range, seek to the position */
gst_rtsp_media_seek (gst_rtsp_session_media_get_media (media), range);
unit = range->unit;
gst_rtsp_range_free (range);
}
}
@ -943,7 +945,7 @@ handle_play_request (GstRTSPClient * client, GstRTSPClientState * state)
/* add the range */
str =
gst_rtsp_media_get_range_string (gst_rtsp_session_media_get_media (media),
TRUE);
TRUE, unit);
gst_rtsp_message_take_header (state->response, GST_RTSP_HDR_RANGE, str);
send_response (client, session, state->response, FALSE);

6
gst/rtsp-server/rtsp-media.c
View file

@ -959,6 +959,7 @@ gst_rtsp_media_get_stream (GstRTSPMedia * media, guint idx)
* gst_rtsp_media_get_range_string:
* @media: a #GstRTSPMedia
* @play: for the PLAY request
* @unit: the unit to use for the string
*
* Get the current range as a string. @media must be prepared with
* gst_rtsp_media_prepare ().
@ -966,7 +967,8 @@ gst_rtsp_media_get_stream (GstRTSPMedia * media, guint idx)
* Returns: The range as a string, g_free() after usage.
*/
gchar *
gst_rtsp_media_get_range_string (GstRTSPMedia * media, gboolean play)
gst_rtsp_media_get_range_string (GstRTSPMedia * media, gboolean play,
GstRTSPRangeUnit unit)
{
GstRTSPMediaPrivate *priv;
gchar *result;
@ -991,6 +993,8 @@ gst_rtsp_media_get_range_string (GstRTSPMedia * media, gboolean play)
g_mutex_unlock (&priv->lock);
g_rec_mutex_unlock (&priv->state_lock);
gst_rtsp_range_convert_units (&range, unit);
result = gst_rtsp_range_to_string (&range);
return result;

4
gst/rtsp-server/rtsp-media.h
View file

@ -155,7 +155,9 @@ guint gst_rtsp_media_n_streams (GstRTSPMedia *media);
GstRTSPStream * gst_rtsp_media_get_stream (GstRTSPMedia *media, guint idx);
gboolean gst_rtsp_media_seek (GstRTSPMedia *media, GstRTSPTimeRange *range);
gchar * gst_rtsp_media_get_range_string (GstRTSPMedia *media, gboolean play);
gchar * gst_rtsp_media_get_range_string (GstRTSPMedia *media,
gboolean play,
GstRTSPRangeUnit unit);
gboolean gst_rtsp_media_set_state (GstRTSPMedia *media, GstState state,
GPtrArray *transports);

2
gst/rtsp-server/rtsp-sdp.c
View file

@ -40,7 +40,7 @@ gst_rtsp_sdp_from_media (GstSDPMessage * sdp, GstSDPInfo * info,
n_streams = gst_rtsp_media_n_streams (media);
rangestr = gst_rtsp_media_get_range_string (media, FALSE);
rangestr = gst_rtsp_media_get_range_string (media, FALSE, GST_RTSP_RANGE_NPT);
if (rangestr == NULL)
goto not_prepared;

12
tests/check/gst/media.c
View file

@ -46,7 +46,7 @@ GST_START_TEST (test_launch)
fail_unless (stream != NULL);
/* fails, need to be prepared */
str = gst_rtsp_media_get_range_string (media, FALSE);
str = gst_rtsp_media_get_range_string (media, FALSE, GST_RTSP_RANGE_NPT);
fail_unless (str == NULL);
fail_unless (gst_rtsp_range_parse ("npt=5.0-", &range) == GST_RTSP_OK);
@ -55,28 +55,28 @@ GST_START_TEST (test_launch)
fail_unless (gst_rtsp_media_prepare (media));
str = gst_rtsp_media_get_range_string (media, FALSE);
str = gst_rtsp_media_get_range_string (media, FALSE, GST_RTSP_RANGE_NPT);
fail_unless (g_str_equal (str, "npt=0-"));
g_free (str);
str = gst_rtsp_media_get_range_string (media, TRUE);
str = gst_rtsp_media_get_range_string (media, TRUE, GST_RTSP_RANGE_NPT);
fail_unless (g_str_equal (str, "npt=0-"));
g_free (str);
fail_unless (gst_rtsp_media_seek (media, range));
str = gst_rtsp_media_get_range_string (media, FALSE);
str = gst_rtsp_media_get_range_string (media, FALSE, GST_RTSP_RANGE_NPT);
fail_unless (g_str_equal (str, "npt=5-"));
g_free (str);
str = gst_rtsp_media_get_range_string (media, TRUE);
str = gst_rtsp_media_get_range_string (media, TRUE, GST_RTSP_RANGE_NPT);
fail_unless (g_str_equal (str, "npt=5-"));
g_free (str);
fail_unless (gst_rtsp_media_unprepare (media));
/* should fail again */
str = gst_rtsp_media_get_range_string (media, FALSE);
str = gst_rtsp_media_get_range_string (media, FALSE, GST_RTSP_RANGE_NPT);
fail_unless (str == NULL);
fail_if (gst_rtsp_media_seek (media, range));

56
tests/check/gst/rtspserver.c
View file

@ -300,8 +300,9 @@ read_response (GstRTSPConnection * conn)
static GstRTSPStatusCode
do_request (GstRTSPConnection * conn, GstRTSPMethod method,
const gchar * control, const gchar * session_in, const gchar * transport_in,
const gchar * range_in,
gchar ** content_type, gchar ** content_base, gchar ** body,
gchar ** session_out, gchar ** transport_out)
gchar ** session_out, gchar ** transport_out, gchar ** range_out)
{
GstRTSPMessage *request;
GstRTSPMessage *response;
@ -318,6 +319,9 @@ do_request (GstRTSPConnection * conn, GstRTSPMethod method,
if (transport_in) {
gst_rtsp_message_add_header (request, GST_RTSP_HDR_TRANSPORT, transport_in);
}
if (range_in) {
gst_rtsp_message_add_header (request, GST_RTSP_HDR_RANGE, range_in);
}
/* send request */
fail_unless (send_request (conn, request));
@ -371,6 +375,10 @@ do_request (GstRTSPConnection * conn, GstRTSPMethod method,
gst_rtsp_message_get_header (response, GST_RTSP_HDR_TRANSPORT, &value, 0);
*transport_out = g_strdup (value);
}
if (range_out) {
gst_rtsp_message_get_header (response, GST_RTSP_HDR_RANGE, &value, 0);
*range_out = g_strdup (value);
}
gst_rtsp_message_free (response);
return code;
@ -382,7 +390,7 @@ do_simple_request (GstRTSPConnection * conn, GstRTSPMethod method,
const gchar * session)
{
return do_request (conn, method, NULL, session, NULL, NULL, NULL,
NULL, NULL, NULL);
NULL, NULL, NULL, NULL, NULL);
}
/* send a DESCRIBE request and receive response. returns a received
@ -398,8 +406,9 @@ do_describe (GstRTSPConnection * conn, const gchar * mount_point)
gchar *expected_content_base;
/* send DESCRIBE request */
fail_unless (do_request (conn, GST_RTSP_DESCRIBE, NULL, NULL, NULL,
&content_type, &content_base, &body, NULL, NULL) == GST_RTSP_STS_OK);
fail_unless (do_request (conn, GST_RTSP_DESCRIBE, NULL, NULL, NULL, NULL,
&content_type, &content_base, &body, NULL, NULL, NULL) ==
GST_RTSP_STS_OK);
/* check response values */
fail_unless (!g_strcmp0 (content_type, "application/sdp"));
@ -451,8 +460,8 @@ do_setup (GstRTSPConnection * conn, const gchar * control,
client_ports->min, client_ports->max);
code =
do_request (conn, GST_RTSP_SETUP, control, session_in,
transport_string_in, NULL, NULL, NULL, session_out,
&transport_string_out);
transport_string_in, NULL, NULL, NULL, NULL, session_out,
&transport_string_out, NULL);
g_free (transport_string_in);
if (transport_string_out) {
@ -744,7 +753,7 @@ done:
}
static void
do_test_play (void)
do_test_play (const gchar * range)
{
GstRTSPConnection *conn;
GstSDPMessage *sdp_message = NULL;
@ -756,6 +765,7 @@ do_test_play (void)
GstRTSPTransport *video_transport = NULL;
GstRTSPTransport *audio_transport = NULL;
GSocket *rtp_socket, *rtcp_socket;
gchar *range_out = NULL;
conn = connect_to_server (test_port, TEST_MOUNT_POINT);
@ -777,8 +787,11 @@ do_test_play (void)
&audio_transport) == GST_RTSP_STS_OK);
/* send PLAY request and check that we get 200 OK */
fail_unless (do_simple_request (conn, GST_RTSP_PLAY,
session) == GST_RTSP_STS_OK);
fail_unless (do_request (conn, GST_RTSP_PLAY, NULL, session, NULL, range,
NULL, NULL, NULL, NULL, NULL, &range_out) == GST_RTSP_STS_OK);
if (range)
fail_unless_equals_string (range, range_out);
g_free (range_out);
receive_rtp (rtp_socket, NULL);
receive_rtcp (rtcp_socket, NULL, 0);
@ -807,7 +820,7 @@ GST_START_TEST (test_play)
{
start_server ();
do_test_play ();
do_test_play (NULL);
stop_server ();
iterate ();
@ -877,7 +890,7 @@ GST_START_TEST (test_play_multithreaded)
start_server ();
do_test_play ();
do_test_play (NULL);
stop_server ();
iterate ();
@ -948,7 +961,7 @@ GST_START_TEST (test_play_multithreaded_block_in_describe)
g_mutex_unlock (&check_mutex);
/* Do a second connection while the first one is blocked */
do_test_play ();
do_test_play (NULL);
/* Now unblock the describe */
g_mutex_lock (&check_mutex);
@ -1315,6 +1328,24 @@ GST_START_TEST (test_play_specific_server_port)
GST_END_TEST;
GST_START_TEST (test_play_smpte_range)
{
start_server ();
do_test_play ("npt=5-");
do_test_play ("smpte=0:00:00-");
do_test_play ("smpte=1:00:00-");
do_test_play ("smpte=1:00:03-");
do_test_play ("clock=20120321T152256Z-");
stop_server ();
iterate ();
}
GST_END_TEST;
static Suite *
rtspserver_suite (void)
{
@ -1338,6 +1369,7 @@ rtspserver_suite (void)
tcase_add_test (tc, test_play_multithreaded_timeout_session);
tcase_add_test (tc, test_play_disconnect);
tcase_add_test (tc, test_play_specific_server_port);
tcase_add_test (tc, test_play_smpte_range);
return s;
}