mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-21 18:04:00 +00:00
deinterlace: Check for subset instead of non-empty intersection for ACCEPT_CAPS
This commit is contained in:
parent
c7d90c1112
commit
3edf0737d6
1 changed files with 4 additions and 4 deletions
|
@ -2087,20 +2087,20 @@ gst_deinterlace_acceptcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps)
|
||||||
if (self->mode == GST_DEINTERLACE_MODE_DISABLED
|
if (self->mode == GST_DEINTERLACE_MODE_DISABLED
|
||||||
|| self->mode == GST_DEINTERLACE_MODE_AUTO) {
|
|| self->mode == GST_DEINTERLACE_MODE_AUTO) {
|
||||||
ourcaps = gst_pad_get_pad_template_caps (pad);
|
ourcaps = gst_pad_get_pad_template_caps (pad);
|
||||||
ret = gst_caps_can_intersect (caps, ourcaps);
|
ret = gst_caps_is_subset (caps, ourcaps);
|
||||||
gst_caps_unref (ourcaps);
|
gst_caps_unref (ourcaps);
|
||||||
} else if (self->mode == GST_DEINTERLACE_MODE_INTERLACED) {
|
} else if (self->mode == GST_DEINTERLACE_MODE_INTERLACED) {
|
||||||
ourcaps = gst_static_caps_get (&deinterlace_caps);
|
ourcaps = gst_static_caps_get (&deinterlace_caps);
|
||||||
ret = gst_caps_can_intersect (caps, ourcaps);
|
ret = gst_caps_is_subset (caps, ourcaps);
|
||||||
gst_caps_unref (ourcaps);
|
gst_caps_unref (ourcaps);
|
||||||
} else if (self->mode == GST_DEINTERLACE_MODE_AUTO_STRICT) {
|
} else if (self->mode == GST_DEINTERLACE_MODE_AUTO_STRICT) {
|
||||||
ourcaps = gst_static_caps_get (&progressive_caps);
|
ourcaps = gst_static_caps_get (&progressive_caps);
|
||||||
ret = gst_caps_can_intersect (caps, ourcaps);
|
ret = gst_caps_is_subset (caps, ourcaps);
|
||||||
gst_caps_unref (ourcaps);
|
gst_caps_unref (ourcaps);
|
||||||
|
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
ourcaps = gst_static_caps_get (&deinterlace_caps);
|
ourcaps = gst_static_caps_get (&deinterlace_caps);
|
||||||
ret = gst_caps_can_intersect (caps, ourcaps);
|
ret = gst_caps_is_subset (caps, ourcaps);
|
||||||
gst_caps_unref (ourcaps);
|
gst_caps_unref (ourcaps);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue