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

[MOVED FROM GST-P-FARSIGHT] Add proper locking to mimenc

Browse source 
20080704220713-3e2dc-6a22d1a423716e8b84bc3bda9986a1b4ff0c0d37.gz
This commit is contained in:
Olivier Crete 2008-07-04 22:07:13 +00:00 committed by Olivier Crête
parent 6c6a95130b
commit 50d366b0f5
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/mimic/gstmimenc.c
View file

@ -163,6 +163,8 @@ gst_mimenc_setcaps (GstPad *pad, GstCaps *caps)
goto out;
}
GST_OBJECT_LOCK (filter);
if (width == 320 && height == 240)
filter->res = MIMIC_RES_HIGH;
else if (width == 160 && height == 120)
@ -170,6 +172,7 @@ gst_mimenc_setcaps (GstPad *pad, GstCaps *caps)
else {
GST_WARNING_OBJECT (filter, "Invalid resolution %dx%d", width, height);
ret = FALSE;
GST_OBJECT_UNLOCK (filter);
goto out;
}
@ -178,6 +181,8 @@ gst_mimenc_setcaps (GstPad *pad, GstCaps *caps)
GST_DEBUG_OBJECT (filter,"Got info from caps w : %d, h : %d",
filter->width, filter->height);
GST_OBJECT_UNLOCK (filter);
out:
gst_object_unref(filter);
return ret;
@ -197,14 +202,15 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
mimenc = GST_MIMENC (gst_pad_get_parent (pad));
g_return_val_if_fail (GST_IS_MIMENC (mimenc), GST_FLOW_ERROR);
g_return_val_if_fail (GST_PAD_IS_LINKED (mimenc->srcpad), GST_FLOW_ERROR);
GST_OBJECT_LOCK (mimenc);
if (mimenc->enc == NULL) {
mimenc->enc = mimic_open ();
if (mimenc->enc == NULL) {
GST_WARNING_OBJECT (mimenc, "mimic_open error\n");
res = GST_FLOW_ERROR;
goto out;
goto out_unlock;
}
if (!mimic_encoder_init (mimenc->enc, mimenc->res)) {
@ -212,7 +218,7 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
mimic_close (mimenc->enc);
mimenc->enc = NULL;
res = GST_FLOW_ERROR;
goto out;
goto out_unlock;
}
if (!mimic_get_property (mimenc->enc, "buffer_size", &mimenc->buffer_size)) {
@ -220,7 +226,7 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
mimic_close (mimenc->enc);
mimenc->enc = NULL;
res = GST_FLOW_ERROR;
goto out;
goto out_unlock;
}
}
@ -236,7 +242,7 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
gst_buffer_unref (out_buf);
gst_buffer_unref (buf);
res = GST_FLOW_ERROR;
goto out;
goto out_unlock;
}
GST_BUFFER_SIZE (out_buf) = buffer_size;
@ -248,6 +254,8 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
header = gst_mimenc_create_tcp_header (mimenc, buffer_size,
GST_BUFFER_TIMESTAMP (buf) / GST_MSECOND);
GST_OBJECT_UNLOCK (mimenc);
if (header)
{
res = gst_pad_push (mimenc->srcpad, header);
@ -270,6 +278,11 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
gst_object_unref (mimenc);
return res;
out_unlock:
GST_OBJECT_UNLOCK (mimenc);
goto out;
}
static GstBuffer*
@ -301,12 +314,14 @@ gst_mimenc_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL:
mimenc = GST_MIMENC (element);
GST_OBJECT_LOCK (element);
if (mimenc->enc != NULL) {
mimic_close (mimenc->enc);
mimenc->enc = NULL;
mimenc->buffer_size = -1;
mimenc->frames = 0;
}
GST_OBJECT_UNLOCK (element);
break;
default:

1
ext/mimic/gstmimenc.h
View file

@ -49,6 +49,7 @@ struct _GstMimEnc
GstPad *sinkpad, *srcpad;
/* Protected by the object lock */
MimCtx *enc;
MimicResEnum res;