summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-09-30 16:22:04 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-09-30 16:22:04 -0400
commit0af7cc8ba735fc1c1de8c52e0201e51cf1ae5ef5 (patch)
tree828e8b3ce70764e624aef6094e9edf068f4d7215
parent18ed4bafb923c5c9bc84377afd29b2512eaa50d6 (diff)
valve: Correctly set the DISCONT flag after dropping buffers
-rw-r--r--gst/valve/gstvalve.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/gst/valve/gstvalve.c b/gst/valve/gstvalve.c
index 38bc52cfc..8754abdaa 100644
--- a/gst/valve/gstvalve.c
+++ b/gst/valve/gstvalve.c
@@ -190,18 +190,19 @@ gst_valve_chain (GstPad * pad, GstBuffer * buffer)
GST_OBJECT_LOCK (valve);
drop = valve->drop;
-
- if (!drop && valve->discont) {
- buffer = gst_buffer_make_metadata_writable (buffer);
- GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
- valve->discont = FALSE;
- }
GST_OBJECT_UNLOCK (valve);
- if (drop)
+ if (drop) {
gst_buffer_unref (buffer);
- else
+ valve->discont = TRUE;
+ } else {
+ if (valve->discont) {
+ buffer = gst_buffer_make_metadata_writable (buffer);
+ GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
+ }
+
ret = gst_pad_push (valve->srcpad, buffer);
+ }
/* Ignore errors if "drop" was changed while the thread was blocked