Commit 7e06ad12 authored by Edward Hervey's avatar Edward Hervey

Re-opens #514717

Original commit message from CVS:
* gst/gstpad.override:
* testsuite/test_pad.py:
Revert 2008-02-10  Alessandro Decina  <alessandro@nnva.org>
Re-opens #514717
parent 98c131e1
2008-06-12 Edward Hervey <edward.hervey@collabora.co.uk>
* gst/gstpad.override:
* testsuite/test_pad.py:
Revert 2008-02-10 Alessandro Decina <alessandro@nnva.org>
Re-opens #514717
2008-06-05 Jan Schmidt <jan.schmidt@sun.com>
* configure.ac:
......
common @ 46ec7dfc
Subproject commit 68fb019d4044b9878aef4ca223fc13c19ffc7d0c
Subproject commit 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8
......@@ -1343,7 +1343,6 @@ pad_block_callback_marshal(GstPad *pad, gboolean blocked, gpointer user_data)
ret = PyObject_CallObject(callback, args);
Py_DECREF(args);
Py_DECREF(py_user_data);
if (!ret)
PyErr_Print();
......
......@@ -516,37 +516,39 @@ class PadRefCountTest(TestCase):
self.assertEquals(self.gccollect(), 1) # collected the pad
gst.debug('going into teardown')
class PadBlockRefcountTest(TestCase):
def testCallbackRefcount(self):
def blocked_cb(pad, blocked):
self.assertTrue(pad.set_blocked_async(False, unblocked_cb))
# re-enable this test once #514717 is fixed
def unblocked_cb(pad, blocked):
pass
# class PadBlockRefcountTest(TestCase):
# def testCallbackRefcount(self):
# def blocked_cb(pad, blocked):
# self.assertTrue(pad.set_blocked_async(False, unblocked_cb))
# def unblocked_cb(pad, blocked):
# pass
cb_refcount = sys.getrefcount(blocked_cb)
# sys.getrefcount() returns refcount + 1
self.assertEquals(cb_refcount, 2)
# cb_refcount = sys.getrefcount(blocked_cb)
# # sys.getrefcount() returns refcount + 1
# self.assertEquals(cb_refcount, 2)
fakesrc = gst.element_factory_make('fakesrc')
fakesrc.props.num_buffers = 2
fakesink = gst.element_factory_make('fakesink')
# fakesrc = gst.element_factory_make('fakesrc')
# fakesrc.props.num_buffers = 2
# fakesink = gst.element_factory_make('fakesink')
pipeline = gst.Pipeline()
pipeline.add(fakesrc, fakesink)
# pipeline = gst.Pipeline()
# pipeline.add(fakesrc, fakesink)
fakesrc.link(fakesink)
# fakesrc.link(fakesink)
pad = fakesrc.get_pad('src')
pad.set_blocked_async(True, blocked_cb)
# pad = fakesrc.get_pad('src')
# pad.set_blocked_async(True, blocked_cb)
pipeline.set_state(gst.STATE_PLAYING)
pipeline.get_bus().poll(gst.MESSAGE_EOS, -1)
pipeline.set_state(gst.STATE_NULL)
# pipeline.set_state(gst.STATE_PLAYING)
# pipeline.get_bus().poll(gst.MESSAGE_EOS, -1)
# pipeline.set_state(gst.STATE_NULL)
# check that we don't leak a ref to the callback
cb_refcount_after = sys.getrefcount(blocked_cb)
self.assertEquals(cb_refcount_after, cb_refcount)
# # check that we don't leak a ref to the callback
# cb_refcount_after = sys.getrefcount(blocked_cb)
# self.assertEquals(cb_refcount_after, cb_refcount)
if __name__ == "__main__":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment