summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristofer Björkström <kristofb@axis.com>2020-10-28 21:48:06 +0100
committerDavid Phung <davidph@axis.com>2020-11-11 13:58:15 +0100
commit1c8a6af13c24d6676cc311c4fe8ba4f7dfc36a2b (patch)
tree32bc90e4fffe6ad9e69875b6acd0b84c579adc32
parent6f336227cd25017933c10da776964a3d4e52bc2f (diff)
media test: Add test for seeking one active stream with a demuxer
Add another seek_one_active_stream test but with a demuxer. The demuxer will flush both streams in opposed to the existing test which only flushes the active stream. This will help exposing problems with the prerolling process after a flushing seek. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/167>
-rw-r--r--tests/check/gst/media.c48
-rw-r--r--tests/check/meson.build1
-rw-r--r--tests/files/test.avibin0 -> 385006 bytes
3 files changed, 41 insertions, 8 deletions
diff --git a/tests/check/gst/media.c b/tests/check/gst/media.c
index 2cb2ba6..0284753 100644
--- a/tests/check/gst/media.c
+++ b/tests/check/gst/media.c
@@ -140,8 +140,8 @@ GST_START_TEST (test_media_seek)
GST_END_TEST;
-/* case: media is complete and contains two streams but only one is active */
-GST_START_TEST (test_media_seek_one_active_stream)
+static void
+media_playback_seek_one_active_stream (const gchar * launch_line)
{
GstRTSPMediaFactory *factory;
GstRTSPMedia *media;
@@ -160,9 +160,7 @@ GST_START_TEST (test_media_seek_one_active_stream)
fail_unless (gst_rtsp_url_parse ("rtsp://localhost:8554/test",
&url) == GST_RTSP_OK);
- gst_rtsp_media_factory_set_launch (factory,
- "( videotestsrc ! rtpvrawpay pt=96 name=pay0 "
- " audiotestsrc ! audioconvert ! rtpL16pay name=pay1 )");
+ gst_rtsp_media_factory_set_launch (factory, launch_line);
media = gst_rtsp_media_factory_construct (factory, url);
fail_unless (GST_IS_RTSP_MEDIA (media));
@@ -196,12 +194,12 @@ GST_START_TEST (test_media_seek_one_active_stream)
fail_unless (gst_rtsp_stream_seekable (stream2));
fail_unless (gst_rtsp_transport_free (transport) == GST_RTSP_OK);
- fail_unless (gst_rtsp_range_parse ("npt=3.0-", &range) == GST_RTSP_OK);
+ fail_unless (gst_rtsp_range_parse ("npt=3.0-5.0", &range) == GST_RTSP_OK);
/* the media is seekable now */
fail_unless (gst_rtsp_media_seek (media, range));
- /* verify that we got the expected range, 'npt=3.0-' */
+ /* verify that we got the expected range, 'npt=3.0-5.0' */
range_str = gst_rtsp_media_get_range_string (media, TRUE, GST_RTSP_RANGE_NPT);
fail_unless (gst_rtsp_range_parse (range_str, &play_range) == GST_RTSP_OK);
fail_unless (play_range->min.seconds == range->min.seconds);
@@ -222,6 +220,30 @@ GST_START_TEST (test_media_seek_one_active_stream)
gst_rtsp_thread_pool_cleanup ();
}
+/* case: media is complete and contains two streams but only one is active,
+ audio & video sources */
+GST_START_TEST (test_media_playback_seek_one_active_stream)
+{
+ media_playback_seek_one_active_stream
+ ("( videotestsrc ! rtpvrawpay pt=96 name=pay0 "
+ " audiotestsrc ! audioconvert ! rtpL16pay name=pay1 )");
+}
+
+GST_END_TEST;
+
+/* case: media is complete and contains two streams but only one is active,
+ demux */
+GST_START_TEST (test_media_playback_demux_seek_one_active_stream)
+{
+ /* FIXME: this test produces "Failed to push event" error messages in the
+ * GST_DEBUG logs because the incomplete stream has no sinks */
+ media_playback_seek_one_active_stream ("( filesrc location="
+ GST_TEST_FILES_PATH "/test.avi !"
+ " avidemux name=demux demux.audio_0 ! queue ! decodebin ! audioconvert !"
+ " audioresample ! rtpL16pay pt=97 name=pay1"
+ " demux.video_0 ! queue ! decodebin ! rtpvrawpay pt=96 name=pay0 )");
+}
+
GST_END_TEST;
GST_START_TEST (test_media_seek_no_sinks)
@@ -847,12 +869,22 @@ rtspmedia_suite (void)
{
Suite *s = suite_create ("rtspmedia");
TCase *tc = tcase_create ("general");
+ gboolean has_avidemux;
suite_add_tcase (s, tc);
tcase_set_timeout (tc, 20);
+
+ has_avidemux = gst_registry_check_feature_version (gst_registry_get (),
+ "avidemux", GST_VERSION_MAJOR, GST_VERSION_MINOR, 0);
+
tcase_add_test (tc, test_media_seek);
tcase_add_test (tc, test_media_seek_no_sinks);
- tcase_add_test (tc, test_media_seek_one_active_stream);
+ tcase_add_test (tc, test_media_playback_seek_one_active_stream);
+ if (has_avidemux) {
+ tcase_add_test (tc, test_media_playback_demux_seek_one_active_stream);
+ } else {
+ GST_INFO ("Skipping test, missing plugins: avidemux");
+ }
tcase_add_test (tc, test_media);
tcase_add_test (tc, test_media_prepare);
tcase_add_test (tc, test_media_shared_race_test_unsuspend_vs_set_state_null);
diff --git a/tests/check/meson.build b/tests/check/meson.build
index 2690430..860774a 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -17,6 +17,7 @@ test_c_args = [
'-UG_DISABLE_ASSERT',
'-UG_DISABLE_CAST_CHECKS',
'-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_PLUGIN_LOADING_WHITELIST"',
+ '-DGST_TEST_FILES_PATH="' + meson.current_source_dir() + '/../files"',
]
rtsp_server_tests = [
diff --git a/tests/files/test.avi b/tests/files/test.avi
new file mode 100644
index 0000000..8c83239
--- /dev/null
+++ b/tests/files/test.avi
Binary files differ