mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

deinterlace: fix on-the-fly changing of "mode" and "fields" properties

Browse source 
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
This commit is contained in:
Tim-Philipp Müller 2013-07-22 18:00:16 +01:00
parent 0c2ff91a5c
commit f18b1f7e80
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/deinterlace/gstdeinterlace.c
View file

@ -1518,6 +1518,8 @@ restart:
field1 = &self->field_history[self->history_count - 1]; field1 = &self->field_history[self->history_count - 1];
if (locking != GST_DEINTERLACE_LOCKING_NONE) { if (locking != GST_DEINTERLACE_LOCKING_NONE) {
GstCaps *sinkcaps;
if (!self->state_count) { if (!self->state_count) {
GST_ERROR_OBJECT (self, GST_ERROR_OBJECT (self,
"BROKEN! Fields in history + no states should not happen!"); "BROKEN! Fields in history + no states should not happen!");
@ -1564,7 +1566,9 @@ restart:
} }
/* setcaps on sink and src pads */ /* 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) { if (flush_one && self->drop_orphans) {
GST_DEBUG_OBJECT (self, "Dropping orphan first field"); GST_DEBUG_OBJECT (self, "Dropping orphan first field");
@ -2040,7 +2044,7 @@ gst_deinterlace_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
self->reconfigure = FALSE; self->reconfigure = FALSE;
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
caps = gst_pad_get_current_caps (self->srcpad); caps = gst_pad_get_current_caps (self->sinkpad);
if (caps != NULL) { if (caps != NULL) {
gst_deinterlace_setcaps (self, self->sinkpad, caps); // FIXME gst_deinterlace_setcaps (self, self->sinkpad, caps); // FIXME
gst_caps_unref (caps); gst_caps_unref (caps);