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

tests: Minor cleanup

Browse source 
Co-Authored by: Thibault Saunier <tsaunier@gnome.org>
This commit is contained in:
Mathieu Duponchelle 2014-07-03 14:34:11 +02:00 committed by Thibault Saunier
parent 9c9fe03b8f
commit d73cab7186
2 changed files with 23 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tests/check/gnl/common.c
View file

@ -54,23 +54,26 @@ static gboolean
compare_segments (CollectStructure * collect, Segment * segment, compare_segments (CollectStructure * collect, Segment * segment,
GstEvent * event) GstEvent * event)
{ {
const GstSegment *orig; const GstSegment *received_segment;
guint64 running_stop, running_start, running_duration; guint64 running_stop, running_start, running_duration;
gst_event_parse_segment (event, &orig); gst_event_parse_segment (event, &received_segment);
GST_DEBUG ("Got Segment rate:%f, format:%s, start:%" GST_TIME_FORMAT GST_DEBUG ("Got Segment rate:%f, format:%s, start:%" GST_TIME_FORMAT
", stop:%" GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT ", stop:%" GST_TIME_FORMAT ", time:%" GST_TIME_FORMAT
", base:%" GST_TIME_FORMAT ", offset:%" GST_TIME_FORMAT, ", base:%" GST_TIME_FORMAT ", offset:%" GST_TIME_FORMAT,
orig->rate, gst_format_get_name (orig->format), received_segment->rate, gst_format_get_name (received_segment->format),
GST_TIME_ARGS (orig->start), GST_TIME_ARGS (orig->stop), GST_TIME_ARGS (received_segment->start),
GST_TIME_ARGS (orig->time), GST_TIME_ARGS (orig->base), GST_TIME_ARGS (received_segment->stop),
GST_TIME_ARGS (orig->offset)); GST_TIME_ARGS (received_segment->time),
GST_TIME_ARGS (received_segment->base),
GST_TIME_ARGS (received_segment->offset));
GST_DEBUG ("[RUNNING] start:%" GST_TIME_FORMAT " [STREAM] start:%" GST_DEBUG ("[RUNNING] start:%" GST_TIME_FORMAT " [STREAM] start:%"
GST_TIME_FORMAT, GST_TIME_ARGS (gst_segment_to_running_time (orig, GST_TIME_FORMAT,
GST_FORMAT_TIME, orig->start)), GST_TIME_ARGS (gst_segment_to_running_time (received_segment,
GST_TIME_ARGS (gst_segment_to_stream_time (orig, GST_FORMAT_TIME, GST_FORMAT_TIME, received_segment->start)),
orig->start))); GST_TIME_ARGS (gst_segment_to_stream_time (received_segment,
GST_FORMAT_TIME, received_segment->start)));
GST_DEBUG ("Expecting rate:%f, format:%s, start:%" GST_TIME_FORMAT GST_DEBUG ("Expecting rate:%f, format:%s, start:%" GST_TIME_FORMAT
", stop:%" GST_TIME_FORMAT ", position:%" GST_TIME_FORMAT ", base:%" ", stop:%" GST_TIME_FORMAT ", position:%" GST_TIME_FORMAT ", base:%"
@ -80,15 +83,17 @@ compare_segments (CollectStructure * collect, Segment * segment,
GST_TIME_ARGS (collect->expected_base)); GST_TIME_ARGS (collect->expected_base));
running_start = running_start =
gst_segment_to_running_time (orig, GST_FORMAT_TIME, orig->start); gst_segment_to_running_time (received_segment, GST_FORMAT_TIME,
received_segment->start);
running_stop = running_stop =
gst_segment_to_running_time (orig, GST_FORMAT_TIME, orig->stop); gst_segment_to_running_time (received_segment, GST_FORMAT_TIME,
received_segment->stop);
running_duration = running_stop - running_start; running_duration = running_stop - running_start;
fail_if (orig->rate != segment->rate); fail_if (received_segment->rate != segment->rate);
fail_if (orig->format != segment->format); fail_if (received_segment->format != segment->format);
fail_unless_equals_int64 (orig->time, segment->position); fail_unless_equals_int64 (received_segment->time, segment->position);
fail_unless_equals_int64 (orig->base, collect->expected_base); fail_unless_equals_int64 (received_segment->base, collect->expected_base);
fail_unless_equals_uint64 (orig->stop - orig->start, fail_unless_equals_uint64 (received_segment->stop - received_segment->start,
segment->stop - segment->start); segment->stop - segment->start);
collect->expected_base += running_duration; collect->expected_base += running_duration;

20
tests/check/gnl/simple.c
View file

@ -247,25 +247,7 @@ test_one_after_other_full (void)
ASSERT_OBJECT_REFCOUNT (source2, "source2", 2); ASSERT_OBJECT_REFCOUNT (source2, "source2", 2);
/* Remove first source */ sink = gst_element_factory_make_or_warn ("autovideosink", "sink");
gst_object_ref (source1);
gnl_composition_remove (GST_BIN (comp), source1);
check_start_stop_duration (comp, 1 * GST_SECOND, 2 * GST_SECOND,
1 * GST_SECOND);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 1);
/* Re-add first source */
gnl_composition_add (GST_BIN (comp), source1);
commit_and_wait (comp, &ret);
check_start_stop_duration (comp, 0, 2 * GST_SECOND, 2 * GST_SECOND);
gst_object_unref (source1);
ASSERT_OBJECT_REFCOUNT (source1, "source1", 2);
sink = gst_element_factory_make_or_warn ("fakesink", "sink");
fail_if (sink == NULL); fail_if (sink == NULL);
gst_bin_add_many (GST_BIN (pipeline), comp, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), comp, sink, NULL);