mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:46:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstelement.override: Release the python lock when performing GStreamer calls that might result in callbacks into ...

Browse source 
Original commit message from CVS:
* gst/gstelement.override:
Release the python lock when performing GStreamer calls that might
result in callbacks into python.
This commit is contained in:
Jan Schmidt 2007-04-13 11:26:43 +00:00
parent 87a5beb47c
commit f77d66033d
2 changed files with 52 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-04-13 Jan Schmidt <thaytan@mad.scientist.com>
* gst/gstelement.override:
Release the python lock when performing GStreamer calls that might
result in callbacks into python.
2007-04-11 Jan Schmidt <thaytan@mad.scientist.com> 2007-04-11 Jan Schmidt <thaytan@mad.scientist.com>
* gst/gstbase.override: * gst/gstbase.override:

54
gst/gstelement.override
View file

@ -37,8 +37,10 @@ _wrap_gst_element_get_pad_template(PyGObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "s:GstElement.get_pad_template", &name)) if (!PyArg_ParseTuple(args, "s:GstElement.get_pad_template", &name))
return NULL; return NULL;
pyg_begin_allow_threads;
tmpl = gst_element_class_get_pad_template tmpl = gst_element_class_get_pad_template
(GST_ELEMENT_GET_CLASS (self->obj), name); (GST_ELEMENT_GET_CLASS (self->obj), name);
pyg_end_allow_threads;
if (tmpl) { if (tmpl) {
ret = pygobject_new (G_OBJECT (tmpl)); ret = pygobject_new (G_OBJECT (tmpl));
@ -137,9 +139,14 @@ _wrap_gst_element_link_many(PyObject *self, PyObject *args)
i = 2; i = 2;
while (1) { while (1) {
gboolean res;
if (!gst_element_link(GST_ELEMENT(element->obj), pyg_begin_allow_threads;
GST_ELEMENT(element2->obj))) res = gst_element_link(GST_ELEMENT(element->obj),
GST_ELEMENT(element2->obj));
pyg_end_allow_threads;
if (!res)
{ {
PyErr_Format(PyGstExc_LinkError, PyErr_Format(PyGstExc_LinkError,
"failed to link %s with %s", "failed to link %s with %s",
@ -186,7 +193,10 @@ _wrap_gst_element_link(PyGObject *self, PyObject *args, PyObject *kwargs)
return NULL; return NULL;
} }
pyg_begin_allow_threads;
ret = gst_element_link_filtered(GST_ELEMENT(self->obj), GST_ELEMENT(dest->obj), caps); ret = gst_element_link_filtered(GST_ELEMENT(self->obj), GST_ELEMENT(dest->obj), caps);
pyg_end_allow_threads;
if (caps && caps_is_copy) if (caps && caps_is_copy)
gst_caps_unref (caps); gst_caps_unref (caps);
if (!ret) { if (!ret) {
@ -246,8 +256,11 @@ _wrap_gst_element_link_pads(PyGObject *self, PyObject *args, PyObject *kwargs)
if (!pad_name_from_object (srcpad, &srcpadname) || if (!pad_name_from_object (srcpad, &srcpadname) ||
!pad_name_from_object (destpad, &destpadname)) !pad_name_from_object (destpad, &destpadname))
return NULL; return NULL;
pyg_begin_allow_threads;
ret = gst_element_link_pads(GST_ELEMENT(self->obj), srcpadname, ret = gst_element_link_pads(GST_ELEMENT(self->obj), srcpadname,
GST_ELEMENT(dest->obj), destpadname); GST_ELEMENT(dest->obj), destpadname);
pyg_end_allow_threads;
if (!ret) { if (!ret) {
PyErr_SetString(PyGstExc_LinkError, "link failed"); PyErr_SetString(PyGstExc_LinkError, "link failed");
return NULL; return NULL;
@ -281,9 +294,11 @@ _wrap_gst_element_link_pads_filtered(PyGObject *self, PyObject *args,
PyErr_SetString(PyExc_TypeError, "filtercaps should be a GstCaps"); PyErr_SetString(PyExc_TypeError, "filtercaps should be a GstCaps");
return NULL; return NULL;
} }
pyg_begin_allow_threads;
ret = gst_element_link_pads_filtered(GST_ELEMENT(self->obj), srcpadname, ret = gst_element_link_pads_filtered(GST_ELEMENT(self->obj), srcpadname,
GST_ELEMENT(dest->obj), destpadname, GST_ELEMENT(dest->obj), destpadname,
filtercaps); filtercaps);
pyg_end_allow_threads;
if (!ret) { if (!ret) {
PyErr_SetString(PyGstExc_LinkError, "link failed"); PyErr_SetString(PyGstExc_LinkError, "link failed");
return NULL; return NULL;
@ -323,7 +338,9 @@ _wrap_gst_element_unlink_many(PyObject *self, PyObject *args)
i = 2; i = 2;
while (1) { while (1) {
pyg_begin_allow_threads;
gst_element_unlink(GST_ELEMENT(element->obj), GST_ELEMENT(element2->obj)); gst_element_unlink(GST_ELEMENT(element->obj), GST_ELEMENT(element2->obj));
pyg_end_allow_threads;
if (i >= len) if (i >= len)
break; break;
@ -358,9 +375,11 @@ _wrap_gst_element_send_event(PyGObject *self, PyObject *args, PyObject *kwargs)
/* The pipeline unrefs the event, but we want to keep the ownership */ /* The pipeline unrefs the event, but we want to keep the ownership */
gst_event_ref(event); gst_event_ref(event);
pyg_begin_allow_threads;
ret = gst_element_send_event(GST_ELEMENT(self->obj), event); ret = gst_element_send_event(GST_ELEMENT(self->obj), event);
return PyBool_FromLong(ret); pyg_end_allow_threads;
return PyBool_FromLong(ret);
} }
%% %%
override gst_element_query_position args override gst_element_query_position args
@ -370,6 +389,7 @@ _wrap_gst_element_query_position (PyGObject *self, PyObject *args)
gint64 cur; gint64 cur;
gint format; gint format;
PyObject *pformat; PyObject *pformat;
gboolean res;
pformat = (PyObject*)PyTuple_GetItem(args, 0); pformat = (PyObject*)PyTuple_GetItem(args, 0);
if (pyg_enum_get_value (GST_TYPE_FORMAT, pformat, &format)) { if (pyg_enum_get_value (GST_TYPE_FORMAT, pformat, &format)) {
@ -377,7 +397,11 @@ _wrap_gst_element_query_position (PyGObject *self, PyObject *args)
return NULL; return NULL;
} }
if (!(gst_element_query_position(GST_ELEMENT (self->obj), (GstFormat*) &format, &cur))) { pyg_begin_allow_threads;
res = gst_element_query_position(GST_ELEMENT (self->obj), (GstFormat*) &format, &cur);
pyg_end_allow_threads;
if (!res) {
PyErr_Format(PyGstExc_QueryError, PyErr_Format(PyGstExc_QueryError,
"query failed"); "query failed");
return NULL; return NULL;
@ -394,6 +418,7 @@ _wrap_gst_element_query_duration (PyGObject *self, PyObject *args)
gint64 cur; gint64 cur;
gint format; gint format;
PyObject *pformat; PyObject *pformat;
gboolean res;
pformat = (PyObject*)PyTuple_GetItem(args, 0); pformat = (PyObject*)PyTuple_GetItem(args, 0);
if (pyg_enum_get_value (GST_TYPE_FORMAT, pformat, &format)) { if (pyg_enum_get_value (GST_TYPE_FORMAT, pformat, &format)) {
@ -401,7 +426,11 @@ _wrap_gst_element_query_duration (PyGObject *self, PyObject *args)
return NULL; return NULL;
} }
if (!(gst_element_query_duration(GST_ELEMENT (self->obj), (GstFormat*) &format, &cur))) { pyg_begin_allow_threads;
res = gst_element_query_duration(GST_ELEMENT (self->obj), (GstFormat*) &format, &cur);
pyg_end_allow_threads;
if (!res) {
PyErr_Format(PyGstExc_QueryError, PyErr_Format(PyGstExc_QueryError,
"query failed"); "query failed");
return NULL; return NULL;
@ -419,6 +448,7 @@ _wrap_gst_element_query_convert (PyGObject *self, PyObject *args, PyObject *kwar
PyObject *pfromformat, *pdestformat; PyObject *pfromformat, *pdestformat;
GstFormat srcformat, destformat; GstFormat srcformat, destformat;
gint64 fromval, dstval; gint64 fromval, dstval;
gboolean res;
/* Input : src_format, src_val, dst_format */ /* Input : src_format, src_val, dst_format */
/* Returns : dst_format, dst_val OR None */ /* Returns : dst_format, dst_val OR None */
@ -437,13 +467,17 @@ _wrap_gst_element_query_convert (PyGObject *self, PyObject *args, PyObject *kwar
return NULL; return NULL;
} }
if (!(gst_element_query_convert (GST_ELEMENT(self->obj), pyg_begin_allow_threads;
res = gst_element_query_convert (GST_ELEMENT(self->obj),
srcformat, fromval, srcformat, fromval,
&destformat, &dstval))) { &destformat, &dstval);
pyg_end_allow_threads;
if (!res) {
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
} }
return Py_BuildValue("(OL)", return Py_BuildValue("(OL)",
pyg_enum_from_gtype(GST_TYPE_FORMAT, destformat), pyg_enum_from_gtype(GST_TYPE_FORMAT, destformat),
dstval); dstval);
@ -458,7 +492,9 @@ _wrap_gst_element_get_query_types (PyGObject *self)
int i; int i;
GstQueryType *tab; GstQueryType *tab;
pyg_begin_allow_threads;
tab = (GstQueryType*) gst_element_get_query_types(GST_ELEMENT(self->obj)); tab = (GstQueryType*) gst_element_get_query_types(GST_ELEMENT(self->obj));
pyg_end_allow_threads;
if (tab == NULL) { if (tab == NULL) {
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
@ -488,8 +524,10 @@ _wrap_gst_element_get_pad_template_list(PyGObject *self)
GList *res = NULL; GList *res = NULL;
guint i; guint i;
pyg_begin_allow_threads;
res = gst_element_class_get_pad_template_list res = gst_element_class_get_pad_template_list
(GST_ELEMENT_GET_CLASS (self->obj)); (GST_ELEMENT_GET_CLASS (self->obj));
pyg_end_allow_threads;
if (res) { if (res) {
i = g_list_length (res); i = g_list_length (res);