mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix bugs

Browse source
This commit is contained in:
Brandon Lewis 2010-05-28 11:42:29 +02:00 committed by Edward Hervey
parent 07693f56f8
commit 542e8afb75
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ges/ges-simple-timeline-layer.c
View file

@ -140,7 +140,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
ges_timeline_object_set_priority (obj, priority - 1); ges_timeline_object_set_priority (obj, priority - 1);
} }
if (GES_TIMELINE_OBJECT_DURATION (prev_object) < dur) { if (prev_object && (GES_TIMELINE_OBJECT_DURATION (prev_object) < dur)) {
GST_ERROR ("transition duration exceeds that of previous neighbor!"); GST_ERROR ("transition duration exceeds that of previous neighbor!");
} }

16
tests/check/ges/simplelayer.c
View file

@ -201,12 +201,12 @@ GST_START_TEST (test_gsl_with_transitions)
fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source2), fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source2),
GST_SECOND); GST_SECOND);
source3 = ges_custom_timeline_source_new (arbitrary_fill_track_func, ELEMENT); source3 = ges_custom_timeline_source_new (arbitrary_fill_track_func, ELEMENT);
g_object_set (source2, "duration", GST_SECOND, "start", (guint64) 42, NULL); g_object_set (source3, "duration", GST_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source2), fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source3),
GST_SECOND); GST_SECOND);
source4 = ges_custom_timeline_source_new (arbitrary_fill_track_func, ELEMENT); source4 = ges_custom_timeline_source_new (arbitrary_fill_track_func, ELEMENT);
g_object_set (source2, "duration", GST_SECOND, "start", (guint64) 42, NULL); g_object_set (source4, "duration", GST_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source2), fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source4),
GST_SECOND); GST_SECOND);
/* create half-second transitions */ /* create half-second transitions */
@ -220,19 +220,19 @@ GST_START_TEST (test_gsl_with_transitions)
tr2 = ges_timeline_transition_new (NULL); tr2 = ges_timeline_transition_new (NULL);
g_object_set (tr2, "duration", HALF_SECOND, "start", (guint64) 42, NULL); g_object_set (tr2, "duration", HALF_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr1), HALF_SECOND); fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr2), HALF_SECOND);
tr3 = ges_timeline_transition_new (NULL); tr3 = ges_timeline_transition_new (NULL);
g_object_set (tr3, "duration", HALF_SECOND, "start", (guint64) 42, NULL); g_object_set (tr3, "duration", HALF_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr1), HALF_SECOND); fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr3), HALF_SECOND);
tr4 = ges_timeline_transition_new (NULL); tr4 = ges_timeline_transition_new (NULL);
g_object_set (tr4, "duration", HALF_SECOND, "start", (guint64) 42, NULL); g_object_set (tr4, "duration", HALF_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr1), HALF_SECOND); fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr4), HALF_SECOND);
tr5 = ges_timeline_transition_new (NULL); tr5 = ges_timeline_transition_new (NULL);
g_object_set (tr5, "duration", HALF_SECOND, "start", (guint64) 42, NULL); g_object_set (tr5, "duration", HALF_SECOND, "start", (guint64) 42, NULL);
fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr1), HALF_SECOND); fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr5), HALF_SECOND);
/* simple test scenario with several sources in layer */ /* simple test scenario with several sources in layer */
/* 0 [0 0.5 1 1.5 2 2.5 3] */ /* 0 [0 0.5 1 1.5 2 2.5 3] */