summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorOlivier Crete <olivier.crete@collabora.co.uk>2008-07-04 22:21:03 +0000
committerEdward Hervey <bilboed@bilboed.com>2009-02-17 19:29:40 +0100
commit8fcd95267dfdff02bca0c3555b8ef2ffed22ef75 (patch)
treef5a59254c04d234dfe332ea06deef5ddd60d1d7f /gst
parentae01ec198053cb6c35af11bc006a28a796319aff (diff)
downloadgst-plugins-bad-8fcd95267dfdff02bca0c3555b8ef2ffed22ef75.tar.gz
gst-plugins-bad-8fcd95267dfdff02bca0c3555b8ef2ffed22ef75.tar.bz2
gst-plugins-bad-8fcd95267dfdff02bca0c3555b8ef2ffed22ef75.zip
[MOVED FROM GST-P-FARSIGHT] Remove useless checks, document locking
20080704222103-3e2dc-47a7f49c414f98a188ffc42b07189daf5147483b.gz
Diffstat (limited to 'gst')
-rw-r--r--gst/siren/gstsirendec.c9
-rw-r--r--gst/siren/gstsirendec.h1
2 files changed, 2 insertions, 8 deletions
diff --git a/gst/siren/gstsirendec.c b/gst/siren/gstsirendec.c
index e74129ae..e9d0a2f6 100644
--- a/gst/siren/gstsirendec.c
+++ b/gst/siren/gstsirendec.c
@@ -167,14 +167,7 @@ gst_siren_dec_chain (GstPad *pad, GstBuffer *buf)
gint decode_ret = 0;
guint size = 0;
- GST_LOG_OBJECT (dec, "Transform");
-
- if (dec->decoder == NULL) {
- GST_DEBUG ("Siren decoder not set");
- return GST_FLOW_WRONG_STATE;
- }
-
- GST_LOG_OBJECT (dec,"Received buffer of size %d", GST_BUFFER_SIZE (buf));
+ GST_LOG_OBJECT (dec, "Decoding buffer of size %d", GST_BUFFER_SIZE (buf));
size = GST_BUFFER_SIZE (buf) * 16;
size -= size % 640;
diff --git a/gst/siren/gstsirendec.h b/gst/siren/gstsirendec.h
index 2006cbc7..bd1533b5 100644
--- a/gst/siren/gstsirendec.h
+++ b/gst/siren/gstsirendec.h
@@ -52,6 +52,7 @@ struct _GstSirenDec
{
GstElement parent;
+ /* Protected by stream lock */
SirenDecoder decoder;
GstPad *sinkpad;