mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

dataurisrc: must release the object lock before using GST_ELEMENT_ERROR

Browse source
This commit is contained in:
Tim-Philipp Müller 2010-01-27 23:39:14 +00:00
parent 78b699278c
commit 61c6c38bd0
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/dataurisrc/gstdataurisrc.c
View file

@ -234,19 +234,31 @@ gst_data_uri_src_create (GstBaseSrc * basesrc, guint64 offset, guint size,
GstFlowReturn ret;
GST_OBJECT_LOCK (src);
if (!src->buffer) {
ret = GST_FLOW_NOT_NEGOTIATED;
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (NULL), (NULL));
} else if (offset + size > GST_BUFFER_SIZE (src->buffer)) {
if (!src->buffer)
goto no_buffer;
/* This is only correct because GstBaseSrc already clips size for us to be no
* larger than the max. available size if a segment at the end is requested */
if (offset + size > GST_BUFFER_SIZE (src->buffer)) {
ret = GST_FLOW_UNEXPECTED;
} else {
ret = GST_FLOW_OK;
*buf = gst_buffer_create_sub (src->buffer, offset, size);
gst_buffer_set_caps (*buf, GST_BUFFER_CAPS (src->buffer));
}
GST_OBJECT_UNLOCK (src);
return ret;
/* ERRORS */
no_buffer:
{
GST_OBJECT_UNLOCK (src);
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (NULL), (NULL));
return GST_FLOW_NOT_NEGOTIATED;
}
}
static gboolean