mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

control-sources: turn into GstObjects

Browse source 
This is a preparation for chaining them.
This commit is contained in:
Stefan Sauer 2011-12-30 18:35:40 +01:00
parent 7f1103544d
commit fcef8d8046
7 changed files with 46 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gstcontrolsource.c
View file

@ -56,7 +56,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
"dynamic parameter control sources");
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstControlSource, gst_control_source,
G_TYPE_OBJECT, _do_init);
GST_TYPE_OBJECT, _do_init);
static void
gst_control_source_class_init (GstControlSourceClass * klass)

4
gst/gstcontrolsource.h
View file

@ -100,7 +100,7 @@ typedef gboolean (* GstControlSourceGetValueArray) (GstControlSource *self,
* The instance structure of #GstControlSource.
*/
struct _GstControlSource {
GObject parent;
GstObject parent;
/*< public >*/
GstControlSourceGetValue get_value; /* Returns the value for a property at a given timestamp */
@ -120,7 +120,7 @@ struct _GstControlSource {
struct _GstControlSourceClass
{
GObjectClass parent_class;
GstObjectClass parent_class;
/*< private >*/
gpointer _gst_reserved[GST_PADDING];

2
tests/benchmarks/controller.c
View file

@ -163,7 +163,7 @@ main (gint argc, gchar * argv[])
GST_TIME_ARGS (elapsed));
}
g_object_unref (csource);
gst_object_unref (csource);
/* play, this test sequential reads */
bt = gst_util_get_timestamp ();

26
tests/check/gst/gstcontroller.c
View file

@ -333,7 +333,7 @@ GST_START_TEST (controller_new_fail1)
GST_CONTROL_SOURCE (cs));
fail_unless (res == FALSE, NULL);
g_object_unref (cs);
gst_object_unref (cs);
gst_object_unref (elem);
}
@ -354,7 +354,7 @@ GST_START_TEST (controller_new_fail2)
"readonly", GST_CONTROL_SOURCE (cs)));
fail_unless (res == FALSE, NULL);
g_object_unref (cs);
gst_object_unref (cs);
gst_object_unref (elem);
}
@ -375,7 +375,7 @@ GST_START_TEST (controller_new_fail3)
"static", GST_CONTROL_SOURCE (cs)));
fail_unless (res == FALSE, NULL);
g_object_unref (cs);
gst_object_unref (cs);
gst_object_unref (elem);
}
@ -397,7 +397,7 @@ GST_START_TEST (controller_new_fail4)
GST_CONTROL_SOURCE (cs)));
fail_unless (res == FALSE, NULL);
g_object_unref (cs);
gst_object_unref (cs);
gst_object_unref (elem);
}
@ -419,7 +419,7 @@ GST_START_TEST (controller_new_okay1)
GST_CONTROL_SOURCE (cs));
fail_unless (res == TRUE, NULL);
g_object_unref (cs);
gst_object_unref (cs);
gst_object_unref (elem);
}
@ -445,8 +445,8 @@ GST_START_TEST (controller_new_okay2)
GST_CONTROL_SOURCE (cs2));
fail_unless (res == TRUE, NULL);
g_object_unref (cs1);
g_object_unref (cs2);
gst_object_unref (cs1);
gst_object_unref (cs2);
gst_object_unref (elem);
}
@ -482,7 +482,7 @@ GST_START_TEST (controller_param_twice)
res = gst_object_set_control_source (GST_OBJECT (elem), "int", NULL);
fail_unless (!res, NULL);
g_object_unref (cs);
gst_object_unref (cs);
gst_object_unref (elem);
}
@ -526,8 +526,8 @@ GST_START_TEST (controller_controlsource_refcounts)
fail_unless (test_csource != NULL, NULL);
fail_unless (test_csource == csource);
fail_unless_equals_int (G_OBJECT (csource)->ref_count, 3);
g_object_unref (test_csource);
g_object_unref (csource);
gst_object_unref (test_csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -550,7 +550,7 @@ GST_START_TEST (controller_bind_twice)
fail_unless (gst_object_set_control_source (GST_OBJECT (elem), "double",
csource));
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -575,7 +575,7 @@ GST_START_TEST (controller_sync1)
fail_unless (gst_object_sync_values (GST_OBJECT (elem), 0LL));
fail_unless_equals_int (GST_TEST_OBJ (elem)->val_int, 50);
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -603,7 +603,7 @@ GST_START_TEST (controller_sync2)
fail_unless_equals_int (GST_TEST_OBJ (elem)->val_int, 50);
fail_unless_equals_float (GST_TEST_OBJ (elem)->val_double, 50.0);
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}

50
tests/check/libs/controller.c
View file

@ -243,7 +243,7 @@ GST_START_TEST (controller_controlsource_empty1)
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_SECOND);
/* unref objects */
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -275,7 +275,7 @@ GST_START_TEST (controller_controlsource_empty2)
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_SECOND);
/* unref objects */
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -314,7 +314,7 @@ GST_START_TEST (controller_interpolate_none)
fail_unless (res, NULL);
fail_unless (gst_timed_value_control_source_get_count (cs) == 2);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_SECOND);
@ -356,7 +356,7 @@ GST_START_TEST (controller_interpolate_linear)
res = gst_timed_value_control_source_set (cs, 2 * GST_SECOND, 1.0);
fail_unless (res, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_SECOND);
@ -402,7 +402,7 @@ GST_START_TEST (controller_interpolate_cubic)
res = gst_timed_value_control_source_set (cs, 4 * GST_SECOND, 0.8);
fail_unless (res, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_SECOND);
@ -451,7 +451,7 @@ GST_START_TEST (controller_interpolate_cubic_too_few_cp)
res = gst_timed_value_control_source_set (cs, 2 * GST_SECOND, 0.4);
fail_unless (res, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps and verify that it used linear
* interpolation as we don't gave enough control points
@ -521,7 +521,7 @@ GST_START_TEST (controller_interpolation_unset)
gst_timed_value_control_source_unset_all (cs);
fail_if (gst_timed_value_control_source_unset (cs, 2 * GST_SECOND));
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -565,7 +565,7 @@ GST_START_TEST (controller_interpolation_unset_all)
gst_timed_value_control_source_unset_all (cs);
GST_TEST_OBJ (elem)->val_int = 0;
g_object_unref (csource);
gst_object_unref (csource);
/* verify value again */
gst_object_sync_values (GST_OBJECT (elem), 1 * GST_SECOND);
@ -627,7 +627,7 @@ GST_START_TEST (controller_interpolation_linear_value_array)
g_free (g_values);
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -661,7 +661,7 @@ GST_START_TEST (controller_interpolation_linear_invalid_values)
res = gst_timed_value_control_source_set (cs, 4 * GST_SECOND, -2.0);
fail_unless (res, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps and see if clipping works */
/* 200.0 */
@ -754,7 +754,7 @@ GST_START_TEST (controller_interpolation_linear_default_values)
gst_object_sync_values (GST_OBJECT (elem), 2 * GST_SECOND);
fail_unless_equals_int (GST_TEST_OBJ (elem)->val_int, 100);
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -793,7 +793,7 @@ GST_START_TEST (controller_interpolate_linear_disabled)
res = gst_timed_value_control_source_set (cs, 2 * GST_SECOND, 1.0);
fail_unless (res, NULL);
g_object_unref (csource1);
gst_object_unref (csource1);
/* set control values */
cs = (GstTimedValueControlSource *) csource2;
@ -802,7 +802,7 @@ GST_START_TEST (controller_interpolate_linear_disabled)
res = gst_timed_value_control_source_set (cs, 2 * GST_SECOND, 0.4);
fail_unless (res, NULL);
g_object_unref (csource2);
gst_object_unref (csource2);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_SECOND);
@ -926,7 +926,7 @@ GST_START_TEST (controller_interpolation_set_from_list)
fail_unless (gst_timed_value_control_source_set_from_list (
(GstTimedValueControlSource *) csource, list));
g_object_unref (csource);
gst_object_unref (csource);
/* allocated GstTimedValue now belongs to the controller, but list not */
g_free (tval);
@ -964,7 +964,7 @@ GST_START_TEST (controller_interpolate_linear_before_ts0)
res = gst_timed_value_control_source_set (cs, 4 * GST_SECOND, 0.0);
fail_unless (res, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps after first control point */
gst_object_sync_values (GST_OBJECT (elem), 2 * GST_SECOND);
@ -1027,7 +1027,7 @@ GST_START_TEST (controller_interpolation_cp_count)
fail_unless (res, NULL);
fail_unless (gst_timed_value_control_source_get_count (cs) == 0);
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -1054,7 +1054,7 @@ GST_START_TEST (controller_lfo_sine)
"frequency", 1.0, "timeshift", (GstClockTime) 0,
"amplitude", 0.5, "offset", 0.5, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_MSECOND);
@ -1107,7 +1107,7 @@ GST_START_TEST (controller_lfo_sine_timeshift)
"frequency", 1.0, "timeshift", 250 * GST_MSECOND,
"amplitude", 0.5, "offset", 0.5, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_MSECOND);
@ -1160,7 +1160,7 @@ GST_START_TEST (controller_lfo_square)
"frequency", 1.0, "timeshift", (GstClockTime) 0,
"amplitude", 0.5, "offset", 0.5, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_MSECOND);
@ -1213,7 +1213,7 @@ GST_START_TEST (controller_lfo_saw)
"frequency", 1.0, "timeshift", (GstClockTime) 0,
"amplitude", 0.5, "offset", 0.5, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_MSECOND);
@ -1266,7 +1266,7 @@ GST_START_TEST (controller_lfo_rsaw)
"frequency", 1.0, "timeshift", (GstClockTime) 0,
"amplitude", 0.5, "offset", 0.5, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_MSECOND);
@ -1319,7 +1319,7 @@ GST_START_TEST (controller_lfo_triangle)
"frequency", 1.0, "timeshift", (GstClockTime) 0,
"amplitude", 0.5, "offset", 0.5, NULL);
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_MSECOND);
@ -1367,7 +1367,7 @@ GST_START_TEST (controller_lfo_none)
fail_unless (gst_object_set_control_source (GST_OBJECT (elem), "int",
GST_CONTROL_SOURCE (csource)));
g_object_unref (csource);
gst_object_unref (csource);
/* now pull in values for some timestamps */
gst_object_sync_values (GST_OBJECT (elem), 0 * GST_MSECOND);
@ -1440,7 +1440,7 @@ GST_START_TEST (controller_trigger_exact)
gst_object_sync_values (GST_OBJECT (elem), 2 * GST_SECOND);
fail_unless_equals_int (GST_TEST_OBJ (elem)->val_int, 100);
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}
@ -1489,7 +1489,7 @@ GST_START_TEST (controller_trigger_tolerance)
gst_object_sync_values (GST_OBJECT (elem), 2 * GST_SECOND);
fail_unless_equals_int (GST_TEST_OBJ (elem)->val_int, 100);
g_object_unref (csource);
gst_object_unref (csource);
gst_object_unref (elem);
}

4
tests/examples/controller/audio-example.c
View file

@ -66,14 +66,14 @@ main (gint argc, gchar ** argv)
gst_timed_value_control_source_set (cs, 0 * GST_SECOND, 0.0);
gst_timed_value_control_source_set (cs, 5 * GST_SECOND, 1.0);
g_object_unref (csource1);
gst_object_unref (csource1);
cs = (GstTimedValueControlSource *) csource2;
gst_timed_value_control_source_set (cs, 0 * GST_SECOND, 220.0);
gst_timed_value_control_source_set (cs, 3 * GST_SECOND, 3520.0);
gst_timed_value_control_source_set (cs, 6 * GST_SECOND, 440.0);
g_object_unref (csource2);
gst_object_unref (csource2);
clock_id =
gst_clock_new_single_shot_id (clock,

2
tests/examples/controller/control-sources.c
View file

@ -218,6 +218,7 @@ test_interpolation (void)
fclose (f);
gst_object_unref (ics);
gst_object_unref (e);
}
@ -268,6 +269,7 @@ test_lfo (void)
fclose (f);
gst_object_unref (lfocs);
gst_object_unref (e);
}