mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-client: Report RECORD and ANNOUNCE as supported in the OPTIONS

Browse source
This commit is contained in:
Jan Schmidt 2015-11-17 01:12:28 +11:00
parent b90d4ba917
commit 9e92a0307c
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2557,6 +2557,7 @@ handle_options_request (GstRTSPClient * client, GstRTSPContext * ctx)
GST_RTSP_OPTIONS | GST_RTSP_OPTIONS |
GST_RTSP_PAUSE | GST_RTSP_PAUSE |
GST_RTSP_PLAY | GST_RTSP_PLAY |
GST_RTSP_RECORD | GST_RTSP_ANNOUNCE |
GST_RTSP_SETUP | GST_RTSP_SETUP |
GST_RTSP_GET_PARAMETER | GST_RTSP_SET_PARAMETER | GST_RTSP_TEARDOWN; GST_RTSP_GET_PARAMETER | GST_RTSP_SET_PARAMETER | GST_RTSP_TEARDOWN;

13
tests/check/gst/client.c
View file

@ -21,7 +21,7 @@
#include <rtsp-client.h> #include <rtsp-client.h>
static gchar * session_id; static gchar *session_id;
static gint cseq; static gint cseq;
static guint expected_session_timeout = 60; static guint expected_session_timeout = 60;
static const gchar *expected_unsupported_header; static const gchar *expected_unsupported_header;
@ -128,7 +128,7 @@ test_response_551 (GstRTSPClient * client, GstRTSPMessage * response,
fail_unless (code == GST_RTSP_STS_OPTION_NOT_SUPPORTED); fail_unless (code == GST_RTSP_STS_OPTION_NOT_SUPPORTED);
fail_unless (g_str_equal (reason, "Option not supported")); fail_unless (g_str_equal (reason, "Option not supported"));
fail_unless (gst_rtsp_message_get_header (response, GST_RTSP_HDR_UNSUPPORTED, fail_unless (gst_rtsp_message_get_header (response, GST_RTSP_HDR_UNSUPPORTED,
&options, 0) == GST_RTSP_OK); &options, 0) == GST_RTSP_OK);
fail_unless (!g_strcmp0 (expected_unsupported_header, options)); fail_unless (!g_strcmp0 (expected_unsupported_header, options));
fail_unless (version == GST_RTSP_VERSION_1_0); fail_unless (version == GST_RTSP_VERSION_1_0);
@ -177,7 +177,7 @@ teardown_client (GstRTSPClient * client)
g_object_unref (client); g_object_unref (client);
} }
static gchar* static gchar *
check_requirements_cb (GstRTSPClient * client, GstRTSPContext * ctx, check_requirements_cb (GstRTSPClient * client, GstRTSPContext * ctx,
gchar ** req, gpointer user_data) gchar ** req, gpointer user_data)
{ {
@ -193,7 +193,7 @@ check_requirements_cb (GstRTSPClient * client, GstRTSPContext * ctx,
index++; index++;
} }
return g_string_free (result, FALSE); return g_string_free (result, FALSE);
} }
GST_START_TEST (test_require) GST_START_TEST (test_require)
@ -393,9 +393,11 @@ test_option_response_200 (GstRTSPClient * client, GstRTSPMessage * response,
methods = gst_rtsp_options_from_text (str); methods = gst_rtsp_options_from_text (str);
fail_if (methods == 0); fail_if (methods == 0);
fail_unless (methods == (GST_RTSP_DESCRIBE | fail_unless (methods == (GST_RTSP_DESCRIBE |
GST_RTSP_ANNOUNCE |
GST_RTSP_OPTIONS | GST_RTSP_OPTIONS |
GST_RTSP_PAUSE | GST_RTSP_PAUSE |
GST_RTSP_PLAY | GST_RTSP_PLAY |
GST_RTSP_RECORD |
GST_RTSP_SETUP | GST_RTSP_SETUP |
GST_RTSP_GET_PARAMETER | GST_RTSP_SET_PARAMETER | GST_RTSP_TEARDOWN)); GST_RTSP_GET_PARAMETER | GST_RTSP_SET_PARAMETER | GST_RTSP_TEARDOWN));
@ -572,8 +574,7 @@ send_teardown (GstRTSPClient * client)
"rtsp://localhost/test") == GST_RTSP_OK); "rtsp://localhost/test") == GST_RTSP_OK);
str = g_strdup_printf ("%d", cseq); str = g_strdup_printf ("%d", cseq);
gst_rtsp_message_take_header (&request, GST_RTSP_HDR_CSEQ, str); gst_rtsp_message_take_header (&request, GST_RTSP_HDR_CSEQ, str);
gst_rtsp_message_add_header (&request, GST_RTSP_HDR_SESSION, gst_rtsp_message_add_header (&request, GST_RTSP_HDR_SESSION, session_id);
session_id);
gst_rtsp_client_set_send_func (client, test_teardown_response_200, gst_rtsp_client_set_send_func (client, test_teardown_response_200,
NULL, NULL); NULL, NULL);
fail_unless (gst_rtsp_client_handle_message (client, fail_unless (gst_rtsp_client_handle_message (client,