deinterlace: Add mode=auto-strict

In this mode we will passthrough all progressive caps but interlaced caps must be
caps where we actually support deinterlacing.

This is the only difference between auto and auto-strict, auto would
passthrough all unsupported interlaced caps.

https://bugzilla.gnome.org/show_bug.cgi?id=720388
This commit is contained in:
Sebastian Dröge 2016-01-26 18:05:51 +01:00
parent 2e8d4e8c7a
commit 46735f8de9
2 changed files with 36 additions and 11 deletions

View file

@ -237,9 +237,11 @@ gst_deinterlace_modes_get_type (void)
static GType deinterlace_modes_type = 0; static GType deinterlace_modes_type = 0;
static const GEnumValue modes_types[] = { static const GEnumValue modes_types[] = {
{GST_DEINTERLACE_MODE_AUTO, "Auto detection", "auto"}, {GST_DEINTERLACE_MODE_AUTO, "Auto detection (best effort)", "auto"},
{GST_DEINTERLACE_MODE_INTERLACED, "Force deinterlacing", "interlaced"}, {GST_DEINTERLACE_MODE_INTERLACED, "Force deinterlacing", "interlaced"},
{GST_DEINTERLACE_MODE_DISABLED, "Run in passthrough mode", "disabled"}, {GST_DEINTERLACE_MODE_DISABLED, "Run in passthrough mode", "disabled"},
{GST_DEINTERLACE_MODE_AUTO_STRICT, "Auto detection (strict)",
"auto-strict"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };
@ -2079,7 +2081,9 @@ gst_deinterlace_acceptcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps)
/* In AUTO/DISABLED mode we accept everything that is compatible with /* In AUTO/DISABLED mode we accept everything that is compatible with
* our template caps. In INTERLACED mode we force deinterlacing, meaning * our template caps. In INTERLACED mode we force deinterlacing, meaning
* we can only possibly support the deinterlace caps */ * we can only possibly support the deinterlace caps.
* In AUTO_STRICT mode we accept all progressive formats, but only those
* interlaced format that we can actually deinterlace */
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);
@ -2089,6 +2093,16 @@ gst_deinterlace_acceptcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps)
ourcaps = gst_static_caps_get (&deinterlace_caps); ourcaps = gst_static_caps_get (&deinterlace_caps);
ret = gst_caps_can_intersect (caps, ourcaps); ret = gst_caps_can_intersect (caps, ourcaps);
gst_caps_unref (ourcaps); gst_caps_unref (ourcaps);
} else if (self->mode == GST_DEINTERLACE_MODE_AUTO_STRICT) {
ourcaps = gst_static_caps_get (&progressive_caps);
ret = gst_caps_can_intersect (caps, ourcaps);
gst_caps_unref (ourcaps);
if (!ret) {
ourcaps = gst_static_caps_get (&deinterlace_caps);
ret = gst_caps_can_intersect (caps, ourcaps);
gst_caps_unref (ourcaps);
}
} else { } else {
g_assert_not_reached (); g_assert_not_reached ();
} }
@ -2299,7 +2313,8 @@ gst_deinterlace_getcaps (GstDeinterlace * self, GstPad * pad, GstCaps * filter)
goto done; goto done;
} }
g_assert (self->mode == GST_DEINTERLACE_MODE_AUTO); g_assert (self->mode == GST_DEINTERLACE_MODE_AUTO
|| self->mode == GST_DEINTERLACE_MODE_AUTO_STRICT);
/* For the auto mode we have to do a bit more than that */ /* For the auto mode we have to do a bit more than that */
ret = gst_caps_new_empty (); ret = gst_caps_new_empty ();
@ -2349,10 +2364,11 @@ gst_deinterlace_getcaps (GstDeinterlace * self, GstPad * pad, GstCaps * filter)
tmp2 = NULL; tmp2 = NULL;
/* or /* or
* - anything else in which case we would just passthrough again. Remember * - anything else in which case we would just passthrough again if we're
* we're here only in AUTO mode, which is best-effort deinterlacing * only in AUTO and not AUTO_STRICT mode
*/ */
ret = gst_caps_merge (ret, gst_caps_copy (caps)); if (self->mode == GST_DEINTERLACE_MODE_AUTO)
ret = gst_caps_merge (ret, gst_caps_copy (caps));
gst_caps_unref (caps); gst_caps_unref (caps);
caps = NULL; caps = NULL;
@ -2529,7 +2545,8 @@ gst_deinterlace_setcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps)
self->passthrough = FALSE; self->passthrough = FALSE;
GST_DEBUG_OBJECT (self, "Not passthrough because mode=interlaced"); GST_DEBUG_OBJECT (self, "Not passthrough because mode=interlaced");
} else if (self->mode == GST_DEINTERLACE_MODE_AUTO) { } else if (self->mode == GST_DEINTERLACE_MODE_AUTO
|| self->mode == GST_DEINTERLACE_MODE_AUTO_STRICT) {
GstCaps *tmp = gst_static_caps_get (&deinterlace_caps); GstCaps *tmp = gst_static_caps_get (&deinterlace_caps);
/* Already progressive? Passthrough */ /* Already progressive? Passthrough */
@ -2542,9 +2559,16 @@ gst_deinterlace_setcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps)
"Not passthrough because mode=auto and interlaced caps"); "Not passthrough because mode=auto and interlaced caps");
self->passthrough = FALSE; self->passthrough = FALSE;
} else { } else {
GST_WARNING_OBJECT (self, if (self->mode == GST_DEINTERLACE_MODE_AUTO) {
"Passthrough because mode=auto and unsupported interlaced caps"); GST_WARNING_OBJECT (self,
self->passthrough = TRUE; "Passthrough because mode=auto and unsupported interlaced caps");
self->passthrough = TRUE;
} else {
gst_caps_unref (tmp);
GST_ERROR_OBJECT (self,
"Unsupported interlaced caps in mode=auto-strict");
goto invalid_caps;
}
} }
gst_caps_unref (tmp); gst_caps_unref (tmp);

View file

@ -76,7 +76,8 @@ typedef enum
typedef enum { typedef enum {
GST_DEINTERLACE_MODE_AUTO, GST_DEINTERLACE_MODE_AUTO,
GST_DEINTERLACE_MODE_INTERLACED, GST_DEINTERLACE_MODE_INTERLACED,
GST_DEINTERLACE_MODE_DISABLED GST_DEINTERLACE_MODE_DISABLED,
GST_DEINTERLACE_MODE_AUTO_STRICT
} GstDeinterlaceMode; } GstDeinterlaceMode;
typedef enum typedef enum