FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] make sirenenc thread safe

Browse Source 
20080704221743-3e2dc-f93da86438f753e14be25166aee45f8802f7d100.gz
This commit is contained in:
Olivier Crete 2008-07-04 22:17:43 +00:00 committed by Edward Hervey
parent 1c3fa06a8f
commit ae01ec1980
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gst/siren/gstsirenenc.c
View File

@ -178,15 +178,9 @@ gst_siren_enc_chain (GstPad *pad, GstBuffer *buf)
gint offset = 0; gint offset = 0;
gint encode_ret = 0; gint encode_ret = 0;
gint size = 0; gint size = 0;
guint in_offset = 0;
if (enc->encoder == NULL) { GST_OBJECT_LOCK (enc);
GST_WARNING ("Siren encoder not set");
return GST_FLOW_WRONG_STATE;
}
if (enc->adapter == NULL) {
GST_ERROR ("Adapter not set");
return GST_FLOW_ERROR;
}
gst_adapter_push (enc->adapter, buf); gst_adapter_push (enc->adapter, buf);
@ -197,41 +191,47 @@ gst_siren_enc_chain (GstPad *pad, GstBuffer *buf)
size /= 16; size /= 16;
size -= size % 40; size -= size % 40;
if (size == 0) if (size == 0) {
return GST_FLOW_OK; GST_OBJECT_UNLOCK (enc);
goto out;
}
data = gst_adapter_take (enc->adapter, size * 16);
GST_OBJECT_UNLOCK (enc);
ret = gst_pad_alloc_buffer_and_set_caps (enc->srcpad, ret = gst_pad_alloc_buffer_and_set_caps (enc->srcpad,
GST_BUFFER_OFFSET (buf) / 16, size, enc->srccaps, &encoded); GST_BUFFER_OFFSET (buf) / 16, size, enc->srccaps, &encoded);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
return ret; goto out;
data = GST_BUFFER_DATA (encoded);
while (gst_adapter_available (enc->adapter) >= 640 &&
ret == GST_FLOW_OK) {
while (offset < size && ret == GST_FLOW_OK) {
GST_LOG_OBJECT (enc, "Encoding frame"); GST_LOG_OBJECT (enc, "Encoding frame");
encode_ret = Siren7_EncodeFrame (enc->encoder, encode_ret = Siren7_EncodeFrame (enc->encoder,
(guint8 *)gst_adapter_peek (enc->adapter, 640), data + in_offset,
data + offset); GST_BUFFER_DATA (encoded) + offset);
if (encode_ret != 0) { if (encode_ret != 0) {
GST_ERROR_OBJECT (enc, "Siren7_EncodeFrame returned %d", encode_ret); GST_ERROR_OBJECT (enc, "Siren7_EncodeFrame returned %d", encode_ret);
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
gst_buffer_unref (encoded);
goto out;
} }
gst_adapter_flush (enc->adapter, 640);
offset += 40; offset += 40;
in_offset += 640;
} }
GST_LOG_OBJECT (enc, "Finished encoding : %d", offset); GST_LOG_OBJECT (enc, "Finished encoding : %d", offset);
GST_BUFFER_SIZE (encoded) = offset;
ret = gst_pad_push (enc->srcpad, encoded); ret = gst_pad_push (enc->srcpad, encoded);
gst_object_unref (enc); out:
if (data)
g_free (data);
gst_object_unref (enc);
return ret; return ret;
} }

2
gst/siren/gstsirenenc.h
View File

@ -52,7 +52,9 @@ struct _GstSirenEnc
{ {
GstElement parent; GstElement parent;
/* protected by the stream lock */
SirenEncoder encoder; SirenEncoder encoder;
/* protected by the object lock */
GstAdapter *adapter; GstAdapter *adapter;
GstPad *srcpad; GstPad *srcpad;