Gsmdec ported to 0.9. Tested with filesrc ! gsmdec ! alsasink and osssink.

Original commit message from CVS:
Gsmdec ported to 0.9. Tested with filesrc ! gsmdec ! alsasink and osssink.
This commit is contained in:
Edgard Lima 2005-09-23 17:05:29 +00:00
parent 4de70b1520
commit efbe7fb694
5 changed files with 65 additions and 77 deletions

View file

@ -1,3 +1,14 @@
2005-09-23 Edgard Lima <edgard.lima@indt.org.br>
* ext/gsm/Makefile.am:
* ext/gsm/gstgsm.c:
* ext/gsm/gstgsmdec.c:
* PORTED_09:
Gsmdec ported to 0.9.
2005-09-22 Arwed v. Merkatz <v.merkatz@gmx.net>
* configure.ac:

View file

@ -1,6 +1,7 @@
When porting a plugin start with 0.8 CVS head, not the old code in this module. There are many bugfixes which have gone into 0.8 which you want to keep.
List of ported plugins (update when you commit a ported plugin):
gsmdec (alima)
sdl (alima)
speed (fcarvalho)
gsmenc (fcarvalho)

View file

@ -1,9 +1,9 @@
plugin_LTLIBRARIES = libgstgsm.la
libgstgsm_la_SOURCES = gstgsm.c gstgsmenc.c
libgstgsm_la_SOURCES = gstgsm.c gstgsmenc.c gstgsmdec.c
libgstgsm_la_CFLAGS = $(GST_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstgsm_la_LIBADD = $(GSM_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-@GST_MAJORMINOR@
libgstgsm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstgsmenc.h
noinst_HEADERS = gstgsmenc.h gstgsmdec.h

View file

@ -29,11 +29,9 @@ plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "gsmenc", GST_RANK_NONE, GST_TYPE_GSMENC))
return FALSE;
/*
if (!gst_element_register (plugin, "gsmdec", GST_RANK_PRIMARY,
GST_TYPE_GSMDEC))
return FALSE;
*/
return TRUE;
}

View file

@ -50,7 +50,7 @@ static void gst_gsmdec_base_init (gpointer g_class);
static void gst_gsmdec_class_init (GstGSMDec * klass);
static void gst_gsmdec_init (GstGSMDec * gsmdec);
static void gst_gsmdec_chain (GstPad * pad, GstData * _data);
static GstFlowReturn gst_gsmdec_chain (GstPad * pad, GstBuffer * buffer);
static GstElementClass *parent_class = NULL;
@ -143,38 +143,13 @@ gst_gsmdec_init (GstGSMDec * gsmdec)
gsmdec->next_of = 0;
}
static void
gst_gsmdec_chain (GstPad * pad, GstData * _data)
static GstFlowReturn
gst_gsmdec_chain (GstPad * pad, GstBuffer * buf)
{
GstGSMDec *gsmdec;
g_return_if_fail (pad != NULL);
g_return_if_fail (GST_IS_PAD (pad));
g_return_if_fail (_data != NULL);
gsmdec = GST_GSMDEC (gst_pad_get_parent (pad));
if (GST_IS_EVENT (_data)) {
GstEvent *event = GST_EVENT (_data);
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS:{
gst_element_set_eos (GST_ELEMENT (gsmdec));
gst_pad_push (gsmdec->srcpad, _data);
break;
}
case GST_EVENT_DISCONTINUOUS:{
/* drop the discontinuity */
break;
}
default:{
gst_pad_event_default (pad, event);
break;
}
}
return;
} else if (GST_IS_BUFFER (_data)) {
GstBuffer *buf = GST_BUFFER (_data);
gsm_byte *data = (gsm_byte *) GST_BUFFER_DATA (buf);
guint size = GST_BUFFER_SIZE (buf);
@ -189,13 +164,15 @@ gst_gsmdec_chain (GstPad * pad, GstData * _data)
GST_BUFFER_DURATION (outbuf) = 20 * GST_MSECOND;
GST_BUFFER_OFFSET (outbuf) = gsmdec->next_of;
GST_BUFFER_OFFSET_END (outbuf) = gsmdec->next_of + 160 - 1;
gst_buffer_set_caps (outbuf, gst_pad_get_caps (gsmdec->srcpad));
gsmdec->next_ts += 20 * GST_MSECOND;
gsmdec->next_of += 160;
gsm_decode (gsmdec->state, gsmdec->buffer,
(gsm_signal *) GST_BUFFER_DATA (outbuf));
gst_pad_push (gsmdec->srcpad, GST_DATA (outbuf));
gst_pad_push (gsmdec->srcpad, outbuf);
size -= (33 - gsmdec->bufsize);
data += (33 - gsmdec->bufsize);
@ -210,11 +187,13 @@ gst_gsmdec_chain (GstPad * pad, GstData * _data)
GST_BUFFER_DURATION (outbuf) = 20 * GST_MSECOND;
GST_BUFFER_OFFSET (outbuf) = gsmdec->next_of;
GST_BUFFER_OFFSET_END (outbuf) = gsmdec->next_of + 160 - 1;
gst_buffer_set_caps (outbuf, gst_pad_get_caps (gsmdec->srcpad));
gsmdec->next_ts += 20 * GST_MSECOND;
gsmdec->next_of += 160;
gsm_decode (gsmdec->state, data, (gsm_signal *) GST_BUFFER_DATA (outbuf));
gst_pad_push (gsmdec->srcpad, GST_DATA (outbuf));
gst_pad_push (gsmdec->srcpad, outbuf);
size -= 33;
data += 33;
@ -225,7 +204,6 @@ gst_gsmdec_chain (GstPad * pad, GstData * _data)
gsmdec->bufsize += size;
}
gst_buffer_unref (buf);
return;
}
return GST_FLOW_OK;
}