Menu
▾
▴
[gst-cvs] alima gst-plugins-good: gst-plugins-good/ gst-plugins-good/ext/speex/
|
From: <al...@fr...> - 2005-10-10 19:57:49
|
CVS Root: /cvs/gstreamer
Module: gst-plugins-good
Changes by: alima
Date: Mon Oct 10 2005 12:57:52 PDT
Log message:
Speexenc ported to 0.9.
Modified files:
. : ChangeLog PORTED_09
ext/speex : Makefile.am gstspeex.c gstspeexenc.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.1880&r2=1.1881
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/PORTED_09.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/speex/Makefile.am.diff?r1=1.6&r2=1.7
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/speex/gstspeex.c.diff?r1=1.9&r2=1.10
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/speex/gstspeexenc.c.diff?r1=1.30&r2=1.31
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.1880
retrieving revision 1.1881
diff -u -d -r1.1880 -r1.1881
--- ChangeLog 10 Oct 2005 14:16:18 -0000 1.1880
+++ ChangeLog 10 Oct 2005 19:57:40 -0000 1.1881
@@ -1,3 +1,11 @@
+2005-10-10 Edgard Lima <edg...@in...>
+
+ * PORTED_09:
+ * ext/speex/Makefile.am:
+ * ext/speex/gstspeex.c:
+ * ext/speex/gstspeexenc.c:
+ Speexenc ported to 0.9
2005-10-10 Wim Taymans <wi...@fl...>
* sys/oss/gstosssink.c: (gst_oss_sink_class_init),
Index: PORTED_09
RCS file: /cvs/gstreamer/gst-plugins-good/PORTED_09,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PORTED_09 22 Sep 2005 22:38:47 -0000 1.8
+++ PORTED_09 10 Oct 2005 19:57:40 -0000 1.9
@@ -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):
+speexenc (alima)
auparse (alima)
effectv (wim)
mad (wim)
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins-good/ext/speex/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am 23 Sep 2005 04:22:55 -0000 1.6
+++ Makefile.am 10 Oct 2005 19:57:40 -0000 1.7
@@ -1,9 +1,9 @@
plugin_LTLIBRARIES = libgstspeex.la
-libgstspeex_la_SOURCES = gstspeex.c gstspeexdec.c
-#gstspeexenc.c
-libgstspeex_la_CFLAGS = $(GST_CFLAGS) $(SPEEX_CFLAGS)
-libgstspeex_la_LIBADD = $(GST_LIBS) $(SPEEX_LIBS)
-libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstspeex_la_SOURCES = gstspeex.c gstspeexdec.c gstspeexenc.c
+libgstspeex_la_CFLAGS = $(GST_CFLAGS) $(SPEEX_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstspeex_la_LIBADD = $(GST_LIBS) $(SPEEX_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+ -lgsttagedit-@GST_MAJORMINOR@
+libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
noinst_HEADERS = gstspeexenc.h gstspeexdec.h
Index: gstspeex.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/speex/gstspeex.c,v
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gstspeex.c 23 Aug 2005 15:14:01 -0000 1.9
+++ gstspeex.c 10 Oct 2005 19:57:40 -0000 1.10
@@ -26,11 +26,11 @@
static gboolean
plugin_init (GstPlugin * plugin)
{
-#if 0
if (!gst_element_register (plugin, "speexenc", GST_RANK_NONE,
GST_TYPE_SPEEXENC))
return FALSE;
-#endif
if (!gst_element_register (plugin, "speexdec", GST_RANK_PRIMARY,
GST_TYPE_SPEEXDEC))
Index: gstspeexenc.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/speex/gstspeexenc.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- gstspeexenc.c 7 Sep 2005 13:49:37 -0000 1.30
+++ gstspeexenc.c 10 Oct 2005 19:57:40 -0000 1.31
@@ -75,6 +75,7 @@
ARG_LAST_MESSAGE
};
+#if 0
static const GstFormat *
gst_speexenc_get_formats (GstPad * pad)
@@ -92,12 +93,14 @@
return (GST_PAD_IS_SRC (pad) ? src_formats : sink_formats);
}
+#endif
static void gst_speexenc_base_init (gpointer g_class);
static void gst_speexenc_class_init (GstSpeexEncClass * klass);
static void gst_speexenc_init (GstSpeexEnc * speexenc);
-static void gst_speexenc_chain (GstPad * pad, GstData * _data);
+static gboolean gst_speexenc_sinkevent (GstPad * pad, GstEvent * event);
+static GstFlowReturn gst_speexenc_chain (GstPad * pad, GstBuffer * buf);
static gboolean gst_speexenc_setup (GstSpeexEnc * speexenc);
static void gst_speexenc_get_property (GObject * object, guint prop_id,
@@ -232,13 +235,13 @@
gstelement_class->change_state = gst_speexenc_change_state;
-static GstPadLinkReturn
-gst_speexenc_sinkconnect (GstPad * pad, const GstCaps * caps)
+static gboolean
+gst_speexenc_sink_setcaps (GstPad * pad, GstCaps * caps)
GstSpeexEnc *speexenc;
GstStructure *structure;
- speexenc = GST_SPEEXENC (gst_pad_get_parent (pad));
+ speexenc = GST_SPEEXENC (GST_PAD_PARENT (pad));
speexenc->setup = FALSE;
structure = gst_caps_get_structure (caps, 0);
@@ -248,9 +251,9 @@
gst_speexenc_setup (speexenc);
if (speexenc->setup)
- return GST_PAD_LINK_OK;
+ return TRUE;
- return GST_PAD_LINK_REFUSED;
+ return FALSE;
@@ -261,7 +264,7 @@
gint64 avg;
if (speexenc->samples_in == 0 ||
speexenc->bytes_out == 0 || speexenc->rate == 0)
@@ -303,7 +306,7 @@
gint bytes_per_sample;
bytes_per_sample = speexenc->channels * 2;
@@ -364,7 +367,6 @@
gst_speexenc_get_query_types (GstPad * pad)
static const GstQueryType gst_speexenc_src_query_types[] = {
- GST_QUERY_TOTAL,
GST_QUERY_POSITION,
0
};
@@ -373,17 +375,17 @@
-gst_speexenc_src_query (GstPad * pad, GstQueryType type,
- GstFormat * format, gint64 * value)
+gst_speexenc_src_query (GstPad * pad, GstQuery * query)
gboolean res = TRUE;
- switch (type) {
- case GST_QUERY_TOTAL:
+ switch (GST_QUERY_TYPE (query)) {
+ case GST_QUERY_POSITION:
{
switch (*format) {
case GST_FORMAT_BYTES:
case GST_FORMAT_TIME:
@@ -416,27 +418,60 @@
}
break;
}
- default:
- res = FALSE;
- break;
}
+ res = FALSE;
break;
}
- case GST_QUERY_POSITION:
- switch (*format) {
- {
- /* we only know about our samples, convert to requested format */
- res = gst_pad_convert (pad,
- GST_FORMAT_BYTES, speexenc->bytes_out, format, value);
- }
- }
+ case GST_QUERY_CONVERT:
+ {
+ GstFormat src_fmt, dest_fmt;
+ gint64 src_val, dest_val;
+ gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
+ if (!(res = gst_speexenc_convert_src (pad, src_fmt, src_val, &dest_fmt,
+ &dest_val)))
+ goto error;
+ gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
+ }
default:
res = FALSE;
}
+error:
+ return res;
+}
+gst_speexenc_sink_query (GstPad * pad, GstQuery * query)
+{
+ gboolean res = TRUE;
+ GstSpeexEnc *speexenc;
+ if (!(res =
+ gst_speexenc_convert_sink (pad, src_fmt, src_val, &dest_fmt,
+ break;
+ default:
+ }
return res;
@@ -446,12 +481,11 @@
speexenc->sinkpad =
gst_pad_new_from_template (gst_speexenc_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (speexenc), speexenc->sinkpad);
+ gst_pad_set_event_function (speexenc->sinkpad, gst_speexenc_sinkevent);
gst_pad_set_chain_function (speexenc->sinkpad, gst_speexenc_chain);
- gst_pad_set_link_function (speexenc->sinkpad, gst_speexenc_sinkconnect);
- gst_pad_set_convert_function (speexenc->sinkpad,
- GST_DEBUG_FUNCPTR (gst_speexenc_convert_sink));
- gst_pad_set_formats_function (speexenc->sinkpad,
- GST_DEBUG_FUNCPTR (gst_speexenc_get_formats));
+ gst_pad_set_setcaps_function (speexenc->sinkpad, gst_speexenc_sink_setcaps);
+ gst_pad_set_query_function (speexenc->sinkpad,
+ GST_DEBUG_FUNCPTR (gst_speexenc_sink_query));
speexenc->srcpad =
gst_pad_new_from_template (gst_speexenc_src_template, "src");
@@ -459,10 +493,6 @@
GST_DEBUG_FUNCPTR (gst_speexenc_src_query));
gst_pad_set_query_type_function (speexenc->srcpad,
GST_DEBUG_FUNCPTR (gst_speexenc_get_query_types));
- gst_pad_set_convert_function (speexenc->srcpad,
- GST_DEBUG_FUNCPTR (gst_speexenc_convert_src));
- gst_pad_set_formats_function (speexenc->srcpad,
gst_element_add_pad (GST_ELEMENT (speexenc), speexenc->srcpad);
speexenc->channels = -1;
@@ -478,14 +508,9 @@
speexenc->nframes = DEFAULT_NFRAMES;
- speexenc->eos = FALSE;
speexenc->header_sent = FALSE;
- speexenc->tags = gst_tag_list_new ();
speexenc->adapter = gst_adapter_new ();
-
- /* we're chained and we can deal with events */
- GST_FLAG_SET (speexenc, GST_ELEMENT_EVENT_AWARE);
@@ -548,15 +573,15 @@
*
* If you have troubles, please write to ym...@jc....
*/
-#define readint(buf, base) (((buf[base+3]<<24) & 0xff000000)| \
- ((buf[base+2]<<16) & 0xff0000)| \
- ((buf[base+1]<< 8) & 0xff00)| \
- (buf[base ] & 0xff))
-#define writeint(buf, base, val) do{ buf[base+3] = ((val)>>24) & 0xff; \
- buf[base+2] = ((val)>>16) & 0xff; \
- buf[base+1] = ((val)>> 8) & 0xff; \
- buf[base ] = (val) & 0xff; \
- }while(0)
+#define readint(buf, base) (((buf[base+3]<<24) & 0xff000000)| \
+ ((buf[base+2]<<16) & 0xff0000)| \
+ ((buf[base+1]<< 8) & 0xff00)| \
+ (buf[base ] & 0xff))
+#define writeint(buf, base, val) do{ buf[base+3] = ((val)>>24) & 0xff; \
+ buf[base+2] = ((val)>>16) & 0xff; \
+ buf[base+1] = ((val)>> 8) & 0xff; \
+ buf[base ] = (val) & 0xff; \
+ }while(0)
static void
comment_init (char **comments, int *length, char *vendor_string)
@@ -658,6 +683,7 @@
speexenc->speex_mode = (SpeexMode *) & speex_nb_mode;
case GST_SPEEXENC_MODE_AUTO:
+ /* fall through */
@@ -796,181 +822,191 @@
speexenc->bytes_out += GST_BUFFER_SIZE (buffer);
if (GST_PAD_IS_USABLE (speexenc->srcpad)) {
- gst_pad_push (speexenc->srcpad, GST_DATA (buffer));
+ gst_pad_push (speexenc->srcpad, buffer);
} else {
gst_buffer_unref (buffer);
-static void
+static GstCaps *
gst_speexenc_set_header_on_caps (GstCaps * caps, GstBuffer * buf1,
GstBuffer * buf2)
+ caps = gst_caps_make_writable (caps);
GstStructure *structure = gst_caps_get_structure (caps, 0);
GValue list = { 0 };
GValue value = { 0 };
/* mark buffers */
- GST_BUFFER_FLAG_SET (buf1, GST_BUFFER_IN_CAPS);
- GST_BUFFER_FLAG_SET (buf2, GST_BUFFER_IN_CAPS);
+ GST_BUFFER_FLAG_SET (buf1, GST_BUFFER_FLAG_IN_CAPS);
+ GST_BUFFER_FLAG_SET (buf2, GST_BUFFER_FLAG_IN_CAPS);
/* put buffers in a fixed list */
- g_value_init (&list, GST_TYPE_FIXED_LIST);
+ g_value_init (&list, GST_TYPE_ARRAY);
g_value_init (&value, GST_TYPE_BUFFER);
- g_value_set_boxed (&value, buf1);
+ gst_value_set_buffer (&value, buf1);
gst_value_list_append_value (&list, &value);
g_value_unset (&value);
- g_value_set_boxed (&value, buf2);
+ gst_value_set_buffer (&value, buf2);
gst_structure_set_value (structure, "streamheader", &list);
g_value_unset (&list);
+ return caps;
-gst_speexenc_chain (GstPad * pad, GstData * _data)
+gst_speexenc_sinkevent (GstPad * pad, GstEvent * event)
- GstBuffer *buf = GST_BUFFER (_data);
- g_return_if_fail (pad != NULL);
- g_return_if_fail (GST_IS_PAD (pad));
- g_return_if_fail (buf != NULL);
- if (GST_IS_EVENT (buf)) {
- GstEvent *event = GST_EVENT (buf);
+ switch (GST_EVENT_TYPE (event)) {
+ case GST_EVENT_EOS:
+ speexenc->eos = TRUE;
+ res = gst_pad_event_default (pad, event);
+ case GST_EVENT_TAG:
+ GstTagList *list;
- switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_EOS:
- speexenc->eos = TRUE;
- gst_event_unref (event);
- break;
- case GST_EVENT_TAG:
- if (speexenc->tags) {
- gst_tag_list_insert (speexenc->tags, gst_event_tag_get_list (event),
- gst_tag_setter_get_merge_mode (GST_TAG_SETTER (speexenc)));
- } else {
- g_assert_not_reached ();
- gst_pad_event_default (pad, event);
- return;
- default:
- }
- } else {
- if (!speexenc->setup) {
- gst_buffer_unref (buf);
- GST_ELEMENT_ERROR (speexenc, CORE, NEGOTIATION, (NULL),
- ("encoder not initialized (input is not audio?)"));
- return;
+ gst_event_parse_tag (event, &list);
+ if (speexenc->tags) {
+ gst_tag_list_insert (speexenc->tags, list,
+ gst_tag_setter_get_merge_mode (GST_TAG_SETTER (speexenc)));
+ } else {
+ g_assert_not_reached ();
+ }
- if (!speexenc->header_sent) {
- /* Speex streams begin with two headers; the initial header (with
- most of the codec setup parameters) which is mandated by the Ogg
- bitstream spec. The second header holds any comment fields.
- We merely need to make the headers, then pass them to libspeex
- one at a time; libspeex handles the additional Ogg bitstream
- constraints */
- GstBuffer *buf1, *buf2;
- GstCaps *caps;
- guchar *data;
- gint data_len;
- gst_speexenc_set_metadata (speexenc);
+static GstFlowReturn
+gst_speexenc_chain (GstPad * pad, GstBuffer * buf)
- /* create header buffer */
- data = speex_header_to_packet (&speexenc->header, &data_len);
- buf1 = gst_speexenc_buffer_from_data (speexenc, data, data_len, 0);
- /* create comment buffer */
- buf2 =
- gst_speexenc_buffer_from_data (speexenc, speexenc->comments,
- speexenc->comment_len, 0);
+ if (!speexenc->setup) {
+ gst_buffer_unref (buf);
+ GST_ELEMENT_ERROR (speexenc, CORE, NEGOTIATION, (NULL),
+ ("encoder not initialized (input is not audio?)"));
+ return GST_FLOW_UNEXPECTED;
- /* mark and put on caps */
- caps = gst_pad_get_caps (speexenc->srcpad);
- gst_speexenc_set_header_on_caps (caps, buf1, buf2);
+ if (!speexenc->header_sent) {
+ /* Speex streams begin with two headers; the initial header (with
+ most of the codec setup parameters) which is mandated by the Ogg
+ bitstream spec. The second header holds any comment fields.
+ We merely need to make the headers, then pass them to libspeex
+ one at a time; libspeex handles the additional Ogg bitstream
+ constraints */
+ GstBuffer *buf1, *buf2;
+ GstCaps *caps;
+ guchar *data;
+ gint data_len;
- /* negotiate with these caps */
- GST_DEBUG ("here are the caps: %" GST_PTR_FORMAT, caps);
- gst_pad_try_set_caps (speexenc->srcpad, caps);
+ gst_speexenc_set_metadata (speexenc);
- /* push out buffers */
- gst_speexenc_push_buffer (speexenc, buf1);
- gst_speexenc_push_buffer (speexenc, buf2);
+ /* create header buffer */
+ data = speex_header_to_packet (&speexenc->header, &data_len);
+ buf1 = gst_speexenc_buffer_from_data (speexenc, data, data_len, 0);
- speex_bits_init (&speexenc->bits);
- speex_bits_reset (&speexenc->bits);
+ /* create comment buffer */
+ buf2 =
+ gst_speexenc_buffer_from_data (speexenc, speexenc->comments,
+ speexenc->comment_len, 0);
- speexenc->header_sent = TRUE;
+ /* mark and put on caps */
+ caps = gst_pad_get_caps (speexenc->srcpad);
+ caps = gst_speexenc_set_header_on_caps (caps, buf1, buf2);
- {
- gint frame_size = speexenc->frame_size;
- gint bytes = frame_size * 2 * speexenc->channels;
+ /* negotiate with these caps */
+ GST_DEBUG ("here are the caps: %" GST_PTR_FORMAT, caps);
+ gst_pad_set_caps (speexenc->srcpad, caps);
- /* push buffer to adapter */
- gst_adapter_push (speexenc->adapter, buf);
+ gst_buffer_set_caps (buf1, caps);
+ gst_buffer_set_caps (buf2, caps);
- while (gst_adapter_available (speexenc->adapter) >= bytes) {
- gint16 *data;
- gint i;
- gint outsize, written;
- GstBuffer *outbuf;
+ /* push out buffers */
+ gst_speexenc_push_buffer (speexenc, buf1);
+ gst_speexenc_push_buffer (speexenc, buf2);
- data = (gint16 *) gst_adapter_peek (speexenc->adapter, bytes);
+ speex_bits_init (&speexenc->bits);
+ speex_bits_reset (&speexenc->bits);
- for (i = 0; i < frame_size * speexenc->channels; i++) {
- speexenc->input[i] = (gfloat) data[i];
- gst_adapter_flush (speexenc->adapter, bytes);
+ speexenc->header_sent = TRUE;
- speexenc->samples_in += frame_size;
+ {
+ gint frame_size = speexenc->frame_size;
+ gint bytes = frame_size * 2 * speexenc->channels;
- if (speexenc->channels == 2) {
- speex_encode_stereo (speexenc->input, frame_size, &speexenc->bits);
- speex_encode (speexenc->state, speexenc->input, &speexenc->bits);
+ /* push buffer to adapter */
+ gst_adapter_push (speexenc->adapter, buf);
- speexenc->frameno++;
+ while (gst_adapter_available (speexenc->adapter) >= bytes) {
+ gint16 *data;
+ gint i;
+ gint outsize, written;
+ GstBuffer *outbuf;
- if ((speexenc->frameno % speexenc->nframes) != 0)
- continue;
+ data = (gint16 *) gst_adapter_peek (speexenc->adapter, bytes);
- speex_bits_insert_terminator (&speexenc->bits);
- outsize = speex_bits_nbytes (&speexenc->bits);
- outbuf =
- gst_pad_alloc_buffer (speexenc->srcpad, GST_BUFFER_OFFSET_NONE,
- outsize);
- written =
- speex_bits_write (&speexenc->bits, GST_BUFFER_DATA (outbuf),
- g_assert (written == outsize);
- speex_bits_reset (&speexenc->bits);
+ for (i = 0; i < frame_size * speexenc->channels; i++) {
+ speexenc->input[i] = (gfloat) data[i];
+ gst_adapter_flush (speexenc->adapter, bytes);
- GST_BUFFER_TIMESTAMP (outbuf) =
- (speexenc->frameno * frame_size -
- speexenc->lookahead) * GST_SECOND / speexenc->rate;
- GST_BUFFER_DURATION (outbuf) = frame_size * GST_SECOND / speexenc->rate;
- GST_BUFFER_OFFSET (outbuf) = speexenc->bytes_out;
- GST_BUFFER_OFFSET_END (outbuf) =
- speexenc->frameno * frame_size - speexenc->lookahead;
+ speexenc->samples_in += frame_size;
- gst_speexenc_push_buffer (speexenc, outbuf);
+ if (speexenc->channels == 2) {
+ speex_encode_stereo (speexenc->input, frame_size, &speexenc->bits);
+ speex_encode (speexenc->state, speexenc->input, &speexenc->bits);
+ speexenc->frameno++;
+ if ((speexenc->frameno % speexenc->nframes) != 0)
+ continue;
+ speex_bits_insert_terminator (&speexenc->bits);
+ outsize = speex_bits_nbytes (&speexenc->bits);
+ gst_pad_alloc_buffer (speexenc->srcpad,
+ GST_BUFFER_OFFSET_NONE, outsize, GST_PAD_CAPS (speexenc->srcpad),
+ &outbuf);
+ written =
+ speex_bits_write (&speexenc->bits, GST_BUFFER_DATA (outbuf), outsize);
+ g_assert (written == outsize);
+ speex_bits_reset (&speexenc->bits);
+ GST_BUFFER_TIMESTAMP (outbuf) =
+ (speexenc->frameno * frame_size -
+ speexenc->lookahead) * GST_SECOND / speexenc->rate;
+ GST_BUFFER_DURATION (outbuf) = frame_size * GST_SECOND / speexenc->rate;
+ GST_BUFFER_OFFSET (outbuf) = speexenc->bytes_out;
+ GST_BUFFER_OFFSET_END (outbuf) =
+ speexenc->frameno * frame_size - speexenc->lookahead;
+ gst_speexenc_push_buffer (speexenc, outbuf);
- if (speexenc->eos) {
- /* clean up and exit. */
- gst_pad_push (speexenc->srcpad, GST_DATA (gst_event_new (GST_EVENT_EOS)));
- gst_element_set_eos (GST_ELEMENT (speexenc));
- }
+ return GST_FLOW_OK;
@@ -1062,31 +1098,37 @@
gst_speexenc_change_state (GstElement * element, GstStateChange transition)
GstSpeexEnc *speexenc = GST_SPEEXENC (element);
+ GstStateChangeReturn res;
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
+ speexenc->tags = gst_tag_list_new ();
case GST_STATE_CHANGE_READY_TO_PAUSED:
- speexenc->eos = FALSE;
speexenc->frameno = 0;
speexenc->samples_in = 0;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+ res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+ switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
case GST_STATE_CHANGE_PAUSED_TO_READY:
speexenc->setup = FALSE;
speexenc->header_sent = FALSE;
- gst_tag_list_free (speexenc->tags);
- speexenc->tags = gst_tag_list_new ();
case GST_STATE_CHANGE_READY_TO_NULL:
+ gst_tag_list_free (speexenc->tags);
+ speexenc->tags = NULL;
- if (GST_ELEMENT_CLASS (parent_class)->change_state)
- return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
- return GST_STATE_CHANGE_SUCCESS;
|