mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix callback args so tests work

Browse source 
Original commit message from CVS:
fix callback args so tests work
This commit is contained in:
Thomas Vander Stichele 2005-01-10 19:02:53 +00:00
parent 4c20bb90a5
commit b6acbfe0a1
2 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/gst.override
View file

@ -627,17 +627,27 @@ probe_handler_marshal(GstProbe *probe, GstData **data, gpointer user_data)
PyGILState_STATE state; PyGILState_STATE state;
PyObject *callback, *args; PyObject *callback, *args;
PyObject *ret; PyObject *ret;
PyObject *py_user_data;
gboolean res; gboolean res;
gint len, i;
g_return_val_if_fail(user_data != NULL, FALSE); g_return_val_if_fail(user_data != NULL, FALSE);
state = pyg_gil_state_ensure(); state = pyg_gil_state_ensure();
callback = PyTuple_GetItem((PyObject *)user_data, 0); py_user_data = (PyObject *) user_data;
args = Py_BuildValue("(NNO)",
callback = PyTuple_GetItem(py_user_data, 0);
args = Py_BuildValue("(NN)",
pyg_boxed_new(GST_TYPE_PROBE, probe, TRUE, TRUE), pyg_boxed_new(GST_TYPE_PROBE, probe, TRUE, TRUE),
pyg_boxed_new(GST_TYPE_DATA, *data, TRUE, TRUE), pyg_boxed_new(GST_TYPE_DATA, *data, TRUE, TRUE));
PyTuple_GetItem((PyObject *)user_data, 1));
len = PyTuple_Size(py_user_data);
for (i = 1; i < len; ++i) {
PyObject *tuple = args;
args = PySequence_Concat(tuple, PyTuple_GetItem(py_user_data, i));
Py_DECREF(tuple);
}
ret = PyObject_CallObject(callback, args); ret = PyObject_CallObject(callback, args);
if (!ret) { if (!ret) {

25
testsuite/test_probe.py
View file

@ -19,7 +19,16 @@ class ProbeTest(unittest.TestCase):
self.assertRaises(TypeError, probe.perform, None) self.assertRaises(TypeError, probe.perform, None)
self.assertRaises(TypeError, probe.perform, "nodata") self.assertRaises(TypeError, probe.perform, "nodata")
def testPerform(self): def testPerformNoArg(self):
probe = gst.Probe(True, self._probe_callback_no_arg)
buffer = gst.Buffer()
probe.perform(buffer)
self.assertEqual(self._no_arg, None)
def _probe_callback_no_arg(self, probe, data):
self._no_arg = None
def testPerformOneArg(self):
probe = gst.Probe(True, self._probe_callback, "yeeha") probe = gst.Probe(True, self._probe_callback, "yeeha")
buffer = gst.Buffer() buffer = gst.Buffer()
probe.perform(buffer) probe.perform(buffer)
@ -28,6 +37,18 @@ class ProbeTest(unittest.TestCase):
def _probe_callback(self, probe, data, result): def _probe_callback(self, probe, data, result):
self._probe_result = result self._probe_result = result
return True return True
def testPerformTwoArgs(self):
probe = gst.Probe(True, self._probe_callback_two, "yeeha", "works")
buffer = gst.Buffer()
probe.perform(buffer)
self.assertEqual(self._probe_result1, "yeeha")
self.assertEqual(self._probe_result2, "works")
def _probe_callback_two(self, probe, data, result1, result2):
self._probe_result1 = result1
self._probe_result2 = result2
return True
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()