diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2014-12-22 16:45:05 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2014-12-22 17:04:05 +0000 |
commit | d4703fa8806cf7d9cc778fb43370daebb37e70cd (patch) | |
tree | 78a12de0a38a1a23b01b2a4ad0ee8456ad91fd62 | |
parent | faed71d328a29cff799a4e57e4775e5815038b4b (diff) | |
download | gstreamer-plugins-bad-d4703fa8806cf7d9cc778fb43370daebb37e70cd.tar.gz |
bayer2rgb: take into account filter in transform_caps function
Fixes criticals when filter caps are passed.
Also fix wrong GST_DEBUG_OBJECT use.
https://bugzilla.gnome.org/show_bug.cgi?id=741863
-rw-r--r-- | gst/bayer/gstbayer2rgb.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c index f07623159..036ac2a86 100644 --- a/gst/bayer/gstbayer2rgb.c +++ b/gst/bayer/gstbayer2rgb.c @@ -286,7 +286,7 @@ gst_bayer2rgb_transform_caps (GstBaseTransform * base, GstCaps *newcaps; GstStructure *newstruct; - GST_DEBUG_OBJECT (caps, "transforming caps (from)"); + GST_DEBUG_OBJECT (base, "transforming caps from %" GST_PTR_FORMAT, caps); structure = gst_caps_get_structure (caps, 0); @@ -305,7 +305,17 @@ gst_bayer2rgb_transform_caps (GstBaseTransform * base, gst_structure_set_value (newstruct, "framerate", gst_structure_get_value (structure, "framerate")); - GST_DEBUG_OBJECT (newcaps, "transforming caps (into)"); + if (filter != NULL) { + GstCaps *icaps; + + GST_DEBUG_OBJECT (base, " filter %" GST_PTR_FORMAT, filter); + + icaps = gst_caps_intersect_full (filter, newcaps, GST_CAPS_INTERSECT_FIRST); + gst_caps_unref (newcaps); + newcaps = icaps; + } + + GST_DEBUG_OBJECT (base, " into %" GST_PTR_FORMAT, newcaps); return newcaps; } |