From f18b1f7e80de90d6465409455d9447008ec9f01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 22 Jul 2013 18:00:16 +0100 Subject: [PATCH] deinterlace: fix on-the-fly changing of "mode" and "fields" properties We call setcaps() to reconfigure ourselves, but we need to pass the current *sink* caps, not the source caps then. Also fix a caps leak. https://bugzilla.gnome.org/show_bug.cgi?id=641599 --- gst/deinterlace/gstdeinterlace.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c index 32109900d9..b9b687c862 100644 --- a/gst/deinterlace/gstdeinterlace.c +++ b/gst/deinterlace/gstdeinterlace.c @@ -1518,6 +1518,8 @@ restart: field1 = &self->field_history[self->history_count - 1]; if (locking != GST_DEINTERLACE_LOCKING_NONE) { + GstCaps *sinkcaps; + if (!self->state_count) { GST_ERROR_OBJECT (self, "BROKEN! Fields in history + no states should not happen!"); @@ -1564,7 +1566,9 @@ restart: } /* setcaps on sink and src pads */ - gst_deinterlace_setcaps (self, self->sinkpad, gst_pad_get_current_caps (self->sinkpad)); // FIXME + sinkcaps = gst_pad_get_current_caps (self->sinkpad); + gst_deinterlace_setcaps (self, self->sinkpad, sinkcaps); // FIXME + gst_caps_unref (sinkcaps); if (flush_one && self->drop_orphans) { GST_DEBUG_OBJECT (self, "Dropping orphan first field"); @@ -2040,7 +2044,7 @@ gst_deinterlace_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) self->reconfigure = FALSE; GST_OBJECT_UNLOCK (self); - caps = gst_pad_get_current_caps (self->srcpad); + caps = gst_pad_get_current_caps (self->sinkpad); if (caps != NULL) { gst_deinterlace_setcaps (self, self->sinkpad, caps); // FIXME gst_caps_unref (caps);