mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 00:06:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

mimdec: Remove local state variable from instance

Browse source
This commit is contained in:
Olivier Crête 2009-10-12 20:06:13 -04:00
parent d05df5500f
commit cf866e11ae
2 changed files with 46 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
ext/mimic/gstmimdec.c
View file

@ -135,10 +135,6 @@ gst_mim_dec_init (GstMimDec * mimdec, GstMimDecClass * klass)
mimdec->dec = NULL; mimdec->dec = NULL;
mimdec->buffer_size = -1; mimdec->buffer_size = -1;
mimdec->have_header = FALSE;
mimdec->payload_size = -1;
mimdec->current_ts = -1;
mimdec->need_newsegment = TRUE;
} }
static void static void
@ -166,6 +162,8 @@ gst_mim_dec_chain (GstPad * pad, GstBuffer * buf)
GstClockTime in_time = GST_BUFFER_TIMESTAMP (buf); GstClockTime in_time = GST_BUFFER_TIMESTAMP (buf);
GstEvent *event = NULL; GstEvent *event = NULL;
gboolean result = TRUE; gboolean result = TRUE;
guint32 payload_size;
guint32 current_ts;
g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR); g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR);
@ -177,9 +175,7 @@ gst_mim_dec_chain (GstPad * pad, GstBuffer * buf)
GST_OBJECT_LOCK (mimdec); GST_OBJECT_LOCK (mimdec);
/* do we have enough bytes to read a header */ /* do we have enough bytes to read a header */
while (gst_adapter_available (mimdec->adapter) >= while (gst_adapter_available (mimdec->adapter) >= 24) {
(mimdec->have_header ? mimdec->payload_size : 24)) {
if (!mimdec->have_header) {
header = (guchar *) gst_adapter_peek (mimdec->adapter, 24); header = (guchar *) gst_adapter_peek (mimdec->adapter, 24);
header_size = header[0]; header_size = header[0];
if (header_size != 24) { if (header_size != 24) {
@ -206,36 +202,30 @@ gst_mim_dec_chain (GstPad * pad, GstBuffer * buf)
goto out; goto out;
} }
mimdec->payload_size = GUINT32_FROM_LE (*((guint32 *) (header + 8))); payload_size = GUINT32_FROM_LE (*((guint32 *) (header + 8)));
mimdec->current_ts = GUINT32_FROM_LE (*((guint32 *) (header + 20))); current_ts = GUINT32_FROM_LE (*((guint32 *) (header + 20)));
GST_DEBUG ("Got packet, payload size %d", mimdec->payload_size); GST_DEBUG ("Got packet, payload size %d", payload_size);
if (gst_adapter_available (mimdec->adapter) < payload_size + 24)
goto out;
/* We have a whole packet and have read the header, lets flush it out */
gst_adapter_flush (mimdec->adapter, 24); gst_adapter_flush (mimdec->adapter, 24);
mimdec->have_header = TRUE; frame_body = (guchar *) gst_adapter_peek (mimdec->adapter, payload_size);
}
if (gst_adapter_available (mimdec->adapter) < mimdec->payload_size) {
goto out;
}
frame_body =
(guchar *) gst_adapter_peek (mimdec->adapter, mimdec->payload_size);
if (mimdec->buffer_size < 0) { if (mimdec->buffer_size < 0) {
/* Check if its a keyframe, otherwise skip it */ /* Check if its a keyframe, otherwise skip it */
if (GUINT32_FROM_LE (*((guint32 *) (frame_body + 12))) != 0) { if (GUINT32_FROM_LE (*((guint32 *) (frame_body + 12))) != 0) {
gst_adapter_flush (mimdec->adapter, mimdec->payload_size); gst_adapter_flush (mimdec->adapter, payload_size);
mimdec->have_header = FALSE;
res = GST_FLOW_OK; res = GST_FLOW_OK;
goto out; goto out;
} }
if (!mimic_decoder_init (mimdec->dec, frame_body)) { if (!mimic_decoder_init (mimdec->dec, frame_body)) {
gst_adapter_flush (mimdec->adapter, mimdec->payload_size); gst_adapter_flush (mimdec->adapter, payload_size);
mimdec->have_header = FALSE;
GST_ELEMENT_ERROR (mimdec, LIBRARY, INIT, (NULL), GST_ELEMENT_ERROR (mimdec, LIBRARY, INIT, (NULL),
("mimic_decoder_init error")); ("mimic_decoder_init error"));
res = GST_FLOW_ERROR; res = GST_FLOW_ERROR;
@ -244,8 +234,7 @@ gst_mim_dec_chain (GstPad * pad, GstBuffer * buf)
if (!mimic_get_property (mimdec->dec, "buffer_size", if (!mimic_get_property (mimdec->dec, "buffer_size",
&mimdec->buffer_size)) { &mimdec->buffer_size)) {
gst_adapter_flush (mimdec->adapter, mimdec->payload_size); gst_adapter_flush (mimdec->adapter, payload_size);
mimdec->have_header = FALSE;
GST_ELEMENT_ERROR (mimdec, LIBRARY, INIT, (NULL), GST_ELEMENT_ERROR (mimdec, LIBRARY, INIT, (NULL),
("mimic_get_property('buffer_size') error")); ("mimic_get_property('buffer_size') error"));
res = GST_FLOW_ERROR; res = GST_FLOW_ERROR;
@ -260,7 +249,7 @@ gst_mim_dec_chain (GstPad * pad, GstBuffer * buf)
in_time, -1, 0); in_time, -1, 0);
else else
event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME,
mimdec->current_ts * GST_MSECOND, -1, 0); current_ts * GST_MSECOND, -1, 0);
} }
mimdec->need_newsegment = FALSE; mimdec->need_newsegment = FALSE;
GST_OBJECT_UNLOCK (mimdec); GST_OBJECT_UNLOCK (mimdec);
@ -281,8 +270,7 @@ gst_mim_dec_chain (GstPad * pad, GstBuffer * buf)
GST_BUFFER_DATA (out_buf))) { GST_BUFFER_DATA (out_buf))) {
GST_WARNING_OBJECT (mimdec, "mimic_decode_frame error\n"); GST_WARNING_OBJECT (mimdec, "mimic_decode_frame error\n");
gst_adapter_flush (mimdec->adapter, mimdec->payload_size); gst_adapter_flush (mimdec->adapter, payload_size);
mimdec->have_header = FALSE;
gst_buffer_unref (out_buf); gst_buffer_unref (out_buf);
GST_ELEMENT_ERROR (mimdec, STREAM, DECODE, (NULL), GST_ELEMENT_ERROR (mimdec, STREAM, DECODE, (NULL),
@ -294,13 +282,13 @@ gst_mim_dec_chain (GstPad * pad, GstBuffer * buf)
if (GST_CLOCK_TIME_IS_VALID (in_time)) if (GST_CLOCK_TIME_IS_VALID (in_time))
GST_BUFFER_TIMESTAMP (out_buf) = in_time; GST_BUFFER_TIMESTAMP (out_buf) = in_time;
else else
GST_BUFFER_TIMESTAMP (out_buf) = mimdec->current_ts * GST_MSECOND; GST_BUFFER_TIMESTAMP (out_buf) = current_ts * GST_MSECOND;
mimic_get_property (mimdec->dec, "width", &width); mimic_get_property (mimdec->dec, "width", &width);
mimic_get_property (mimdec->dec, "height", &height); mimic_get_property (mimdec->dec, "height", &height);
GST_DEBUG_OBJECT (mimdec, GST_DEBUG_OBJECT (mimdec,
"got WxH %d x %d payload size %d buffer_size %d", "got WxH %d x %d payload size %d buffer_size %d",
width, height, mimdec->payload_size, mimdec->buffer_size); width, height, payload_size, mimdec->buffer_size);
caps = gst_caps_new_simple ("video/x-raw-rgb", caps = gst_caps_new_simple ("video/x-raw-rgb",
"bpp", G_TYPE_INT, 24, "bpp", G_TYPE_INT, 24,
"depth", G_TYPE_INT, 24, "depth", G_TYPE_INT, 24,
@ -316,8 +304,7 @@ gst_mim_dec_chain (GstPad * pad, GstBuffer * buf)
res = gst_pad_push (mimdec->srcpad, out_buf); res = gst_pad_push (mimdec->srcpad, out_buf);
GST_OBJECT_LOCK (mimdec); GST_OBJECT_LOCK (mimdec);
gst_adapter_flush (mimdec->adapter, mimdec->payload_size); gst_adapter_flush (mimdec->adapter, payload_size);
mimdec->have_header = FALSE;
} }
out: out:
@ -367,9 +354,6 @@ gst_mim_dec_change_state (GstElement * element, GstStateChange transition)
mimic_close (mimdec->dec); mimic_close (mimdec->dec);
mimdec->dec = NULL; mimdec->dec = NULL;
mimdec->buffer_size = -1; mimdec->buffer_size = -1;
mimdec->have_header = FALSE;
mimdec->payload_size = -1;
mimdec->current_ts = -1;
} }
GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (element);
break; break;

3
ext/mimic/gstmimdec.h
View file

@ -54,9 +54,6 @@ struct _GstMimDec
MimCtx *dec; MimCtx *dec;
gint buffer_size; gint buffer_size;
gboolean have_header;
guint32 payload_size;
guint32 current_ts;
gboolean need_newsegment; gboolean need_newsegment;
}; };