From 6772fa7d275b6ce02766297c660cd5cf5c2ee80c Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 7 Jun 2017 09:16:45 -0400 Subject: [PATCH] validate: Add 'our own' RTSP server implementation --- validate/configure.ac | 8 ++ validate/launcher/apps/gstvalidate.py | 19 +-- validate/tools/Makefile.am | 13 ++ validate/tools/gst-validate-rtsp-server.c | 158 ++++++++++++++++++++++ validate/tools/meson.build | 14 ++ 5 files changed, 203 insertions(+), 9 deletions(-) create mode 100644 validate/tools/gst-validate-rtsp-server.c diff --git a/validate/configure.ac b/validate/configure.ac index e0a7407a94..38b4a77682 100644 --- a/validate/configure.ac +++ b/validate/configure.ac @@ -201,6 +201,14 @@ if test "x$HAVE_CAIRO" != "xyes"; then AC_MSG_NOTICE([Cairo is needed for the gst-validate-images-tool]) fi +PKG_CHECK_MODULES(GST_RTSP_SERVER, "gstreamer-rtsp-server-1.0", HAVE_GST_RTSP_SERVER=yes, HAVE_GST_RTSP_SERVER=no) +AC_SUBST(GST_RTSP_SERVER_CFLAGS) +AC_SUBST(GST_RTSP_SERVER_LIBS) +AM_CONDITIONAL(HAVE_GST_RTSP_SERVER, test ! "x$HAVE_GST_RTSP_SERVER" = "xno") +if test "x$HAVE_GST_RTSP_SERVER" != "xyes"; then + AC_MSG_NOTICE([GstRtspServer is needed for the gst-validate-rtsp-server]) +fi + PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0) AC_SUBST(JSON_GLIB_LIBS) AC_SUBST(JSON_GLIB_CFLAGS) diff --git a/validate/launcher/apps/gstvalidate.py b/validate/launcher/apps/gstvalidate.py index c16a80ef78..ed0f992acb 100644 --- a/validate/launcher/apps/gstvalidate.py +++ b/validate/launcher/apps/gstvalidate.py @@ -49,13 +49,14 @@ parser.add_argument("--validate-tools-path", dest="validate_tools_path", options, args = parser.parse_known_args() GST_VALIDATE_COMMAND = which("gst-validate-1.0", options.validate_tools_path) -GST_VALIDATE_TRANSCODING_COMMAND = which( - "gst-validate-transcoding-1.0", options.validate_tools_path) -G_V_DISCOVERER_COMMAND = which( - "gst-validate-media-check-1.0", options.validate_tools_path) -ScenarioManager.GST_VALIDATE_COMMAND = GST_VALIDATE_COMMAND -RTSP_SERVER_COMMAND = "gst-rtsp-server-example-uri-1.0" +GST_VALIDATE_TRANSCODING_COMMAND = which("gst-validate-transcoding-1.0", + options.validate_tools_path) +G_V_DISCOVERER_COMMAND = which("gst-validate-media-check-1.0", + options.validate_tools_path) +GST_VALIDATE_RTSP_SERVER_COMMAND = which("gst-validate-rtsp-server-1.0", + options.validate_tools_path) +ScenarioManager.GST_VALIDATE_COMMAND = GST_VALIDATE_COMMAND AUDIO_ONLY_FILE_TRANSCODING_RATIO = 5 # @@ -289,10 +290,10 @@ class GstValidatePlaybinTestsGenerator(GstValidatePipelineTestsGenerator): os.path.basename(minfo.media_descriptor.get_clean_name())) def populate_tests(self, uri_minfo_special_scenarios, scenarios): - test_rtsp = which(RTSP_SERVER_COMMAND) + test_rtsp = which(GST_VALIDATE_RTSP_SERVER_COMMAND) if not test_rtsp: printc("\n\nRTSP server not available, you should make sure" - " that %s is available in your $PATH." % RTSP_SERVER_COMMAND, + " that %s is available in your $PATH." % GST_VALIDATE_RTSP_SERVER_COMMAND, Colors.FAIL) elif self.test_manager.options.disable_rtsp: printc("\n\nRTSP tests are disabled") @@ -625,7 +626,7 @@ class GstValidateBaseRTSPTest: self.rtspserver_logs = sys.stderr self.server_port = self.__get_open_port() - command = [RTSP_SERVER_COMMAND, self._local_uri, '--port', str(self.server_port)] + command = [GST_VALIDATE_RTSP_SERVER_COMMAND, self._local_uri, '--port', str(self.server_port)] if self.options.validate_gdb_server: command = self.use_gdb(command) diff --git a/validate/tools/Makefile.am b/validate/tools/Makefile.am index 236ab2bc27..2c5d212272 100644 --- a/validate/tools/Makefile.am +++ b/validate/tools/Makefile.am @@ -34,6 +34,19 @@ gst_validate_media_check_@GST_API_VERSION@_SOURCES = gst-validate-media-check.c gst_validate_media_check_@GST_API_VERSION@_debug_SOURCES = gst-validate-media-check.c gst_validate_media_check_@GST_API_VERSION@_debug_LDFLAGS = -no-install +if HAVE_GST_RTSP_SERVER +bin_PROGRAMS += gst-validate-rtsp-server-@GST_API_VERSION@ +noinst_PROGRAMS += gst-validate-rtsp-server-@GST_API_VERSION@-debug + +gst_validate_rtsp_server_@GST_API_VERSION@_SOURCES = gst-validate-rtsp-server.c +gst_validate_rtsp_server_@GST_API_VERSION@_CFLAGS = $(GST_RTSP_SERVER_CFLAGS) +gst_validate_rtsp_server_@GST_API_VERSION@_LDADD = $(top_builddir)/gst-libs/gst/video/libgstvalidatevideo-@GST_API_VERSION@.la $(LDADD) $(GST_RTSP_SERVER_LIBS) +gst_validate_rtsp_server_@GST_API_VERSION@_debug_SOURCES = gst-validate-rtsp-server.c +gst_validate_rtsp_server_@GST_API_VERSION@_debug_LDADD = $(top_builddir)/gst-libs/gst/video/libgstvalidatevideo-@GST_API_VERSION@.la $(LDADD) $(GST_RTSP_SERVER_LIBS) +gst_validate_rtsp_server_@GST_API_VERSION@_debug_LDFLAGS = -no-install +gst_validate_rtsp_server_@GST_API_VERSION@_debug_CFLAGS = $(GST_RTSP_SERVER_CFLAGS) +endif + if HAVE_CAIRO bin_PROGRAMS += gst-validate-images-check-@GST_API_VERSION@ noinst_PROGRAMS += gst-validate-images-check-@GST_API_VERSION@-debug diff --git a/validate/tools/gst-validate-rtsp-server.c b/validate/tools/gst-validate-rtsp-server.c new file mode 100644 index 0000000000..93602db95f --- /dev/null +++ b/validate/tools/gst-validate-rtsp-server.c @@ -0,0 +1,158 @@ +/* GStreamer + * Copyright (C) 2008 Wim Taymans + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +/* Cc'd from the test-uri example */ +#include + +#include +#include + +#define DEFAULT_RTSP_PORT "8554" + +static char *port = (char *) DEFAULT_RTSP_PORT; + +static GOptionEntry entries[] = { + {"port", 'p', 0, G_OPTION_ARG_STRING, &port, + "Port to listen on (default: " DEFAULT_RTSP_PORT ")", "PORT"}, + {NULL} +}; + + +static gboolean +timeout (GstRTSPServer * server) +{ + GstRTSPSessionPool *pool; + + pool = gst_rtsp_server_get_session_pool (server); + gst_rtsp_session_pool_cleanup (pool); + g_object_unref (pool); + + return TRUE; +} + +#if 0 +static gboolean +remove_map (GstRTSPServer * server) +{ + GstRTSPMountPoints *mounts; + + g_print ("removing /test mount point\n"); + mounts = gst_rtsp_server_get_mount_points (server); + gst_rtsp_mount_points_remove_factory (mounts, "/test"); + g_object_unref (mounts); + + return FALSE; +} +#endif + +int +main (int argc, gchar * argv[]) +{ + GMainLoop *loop; + GstRTSPServer *server; + GstRTSPMountPoints *mounts; + GstRTSPMediaFactoryURI *factory; + GOptionContext *optctx; + GError *error = NULL; + gchar *uri; + + optctx = g_option_context_new (" - GstValidate RTSP server, URI"); + g_option_context_add_main_entries (optctx, entries, NULL); + g_option_context_add_group (optctx, gst_init_get_option_group ()); + if (!g_option_context_parse (optctx, &argc, &argv, &error)) { + g_printerr ("Error parsing options: %s\n", error->message); + g_option_context_free (optctx); + g_clear_error (&error); + return -1; + } + g_option_context_free (optctx); + + if (argc < 2) { + g_printerr ("Please pass an URI or file as argument!\n"); + return -1; + } + + loop = g_main_loop_new (NULL, FALSE); + + /* create a server instance */ + server = gst_rtsp_server_new (); + g_object_set (server, "service", port, NULL); + + /* get the mount points for this server, every server has a default object + * that be used to map uri mount points to media factories */ + mounts = gst_rtsp_server_get_mount_points (server); + + /* make a URI media factory for a test stream. */ + factory = gst_rtsp_media_factory_uri_new (); + + /* when using GStreamer as a client, one can use the gst payloader, which is + * more efficient when there is no payloader for the compressed format */ + /* g_object_set (factory, "use-gstpay", TRUE, NULL); */ + + /* check if URI is valid, otherwise convert filename to URI if it's a file */ + if (gst_uri_is_valid (argv[1])) { + uri = g_strdup (argv[1]); + } else if (g_file_test (argv[1], G_FILE_TEST_EXISTS)) { + uri = gst_filename_to_uri (argv[1], NULL); + } else { + g_printerr ("Unrecognised command line argument '%s'.\n" + "Please pass an URI or file as argument!\n", argv[1]); + return -1; + } + + gst_rtsp_media_factory_uri_set_uri (factory, uri); + g_free (uri); + + /* if you want multiple clients to see the same video, set the shared property + * to TRUE */ + /* gst_rtsp_media_factory_set_shared ( GST_RTSP_MEDIA_FACTORY (factory), TRUE); */ + + /* attach the test factory to the /test url */ + gst_rtsp_mount_points_add_factory (mounts, "/test", + GST_RTSP_MEDIA_FACTORY (factory)); + + /* don't need the ref to the mapper anymore */ + g_object_unref (mounts); + + /* attach the server to the default maincontext */ + if (gst_rtsp_server_attach (server, NULL) == 0) + goto failed; + + /* do session cleanup every 2 seconds */ + g_timeout_add_seconds (2, (GSourceFunc) timeout, server); + +#if 0 + /* remove the mount point after 10 seconds, new clients won't be able to use + * the /test url anymore */ + g_timeout_add_seconds (10, (GSourceFunc) remove_map, server); +#endif + + /* start serving */ + g_print ("stream ready at rtsp://127.0.0.1:%s/test\n", port); + g_main_loop_run (loop); + + return 0; + + /* ERRORS */ +failed: + { + g_print ("failed to attach the server\n"); + return -1; + } +} diff --git a/validate/tools/meson.build b/validate/tools/meson.build index 5812d7dd59..de87c3a678 100644 --- a/validate/tools/meson.build +++ b/validate/tools/meson.build @@ -22,6 +22,20 @@ executable('gst-validate-media-check-' + apiversion, link_with : [gstvalidate] ) +rtsp_server_dep = dependency('gstreamer-rtsp-server-' + apiversion, + fallback: ['gst-rtsp-server', 'gst_rtsp_server_dep']) + +if rtsp_server_dep.found() + executable('gst-validate-rtsp-server-' + apiversion, + 'gst-validate-rtsp-server.c', + install: true, + include_directories: inc_dirs, + dependencies: [rtsp_server_dep], + c_args: [gst_c_args], + link_with: [gstvalidate] + ) +endif + if cairo_dep.found() executable('gst-validate-image-check-' + apiversion, 'gst-validate-images-check.c',