diff options
author | Vineeth T M <vineeth.tm@samsung.com> | 2014-08-28 16:13:29 +0530 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2014-08-28 14:55:00 +0300 |
commit | d46631c5c7312ad613397f8238c7a9714ae3ae94 (patch) | |
tree | 471d553ef19ff95e6c9448e0a7fa0138196ca3d6 | |
parent | 0509e86b433aaa7976b67c2b4c8a7de5827bdd77 (diff) |
imagefreeze: Remove impossible error condition
We return EOS after the first buffer, and GstPad will make sure now that we
won't get any other buffer afterwards until a flush happens. No need to check
for it ourselves.
https://bugzilla.gnome.org/show_bug.cgi?id=735581
-rw-r--r-- | gst/imagefreeze/gstimagefreeze.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gst/imagefreeze/gstimagefreeze.c b/gst/imagefreeze/gstimagefreeze.c index 9b13c14eb..9395db9be 100644 --- a/gst/imagefreeze/gstimagefreeze.c +++ b/gst/imagefreeze/gstimagefreeze.c @@ -669,14 +669,9 @@ gst_image_freeze_sink_chain (GstPad * pad, GstObject * parent, { GstImageFreeze *self = GST_IMAGE_FREEZE (parent); - g_mutex_lock (&self->lock); - if (self->buffer) { - GST_DEBUG_OBJECT (pad, "Already have a buffer, dropping"); - gst_buffer_unref (buffer); - g_mutex_unlock (&self->lock); - return GST_FLOW_EOS; - } + g_return_val_if_fail (self->buffer == NULL, GST_FLOW_ERROR); + g_mutex_lock (&self->lock); self->buffer = buffer; gst_pad_start_task (self->srcpad, (GstTaskFunction) gst_image_freeze_src_loop, |