libs/gst/base/gstbasetransform.c: Revert quick accepcaps attempt, it's not fully equivalent to the old behaviour and ...

Original commit message from CVS:
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_acceptcaps):
Revert quick accepcaps attempt, it's not fully equivalent to the old
behaviour and thus causes regressions.
This commit is contained in:
Wim Taymans 2008-11-24 15:27:55 +00:00
parent aa1dfbb004
commit c577a143b9
2 changed files with 15 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2008-11-24 Wim Taymans <wim.taymans@collabora.co.uk>
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_acceptcaps):
Revert quick accepcaps attempt, it's not fully equivalent to the old
behaviour and thus causes regressions.
2008-11-24 Edward Hervey <edward.hervey@collabora.co.uk>
* plugins/elements/gstfilesrc.c: (gst_file_src_uri_set_uri):

View file

@ -979,9 +979,12 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps)
trans = GST_BASE_TRANSFORM (gst_pad_get_parent (pad));
otherpad = (pad == trans->srcpad) ? trans->sinkpad : trans->srcpad;
#if 0
/* we need fixed caps for the check, fall back to the default implementation
* if we don't */
if (!gst_caps_is_fixed (caps)) {
if (!gst_caps_is_fixed (caps))
#endif
{
GstCaps *allowed, *intersect;
GST_DEBUG_OBJECT (pad, "non fixed accept caps %" GST_PTR_FORMAT, caps);
@ -1003,7 +1006,9 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps)
if (!ret)
goto no_transform_possible;
} else {
}
#if 0
else {
GST_DEBUG_OBJECT (pad, "accept caps %" GST_PTR_FORMAT, caps);
/* find best possible caps for the other pad as a way to see if we can
@ -1014,6 +1019,7 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps)
GST_DEBUG_OBJECT (pad, "we can transform to %" GST_PTR_FORMAT, othercaps);
}
#endif
done:
if (othercaps)