mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

deinterlace: the field in caps is "interlace-mode" not "interlace-method"

Browse source 
Fix deinterlace unit test. Need to set right field on output caps.
Also remove right field (not old 0.10 "interlaced" boolean field)
from caps in unit test before comparing old and new.
This commit is contained in:
Tim-Philipp Müller 2012-08-26 22:08:54 +01:00
parent d35fbcf6f1
commit 045c4b6ec8
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/deinterlace/gstdeinterlace.c
View file

@ -2358,7 +2358,7 @@ gst_deinterlace_setcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps)
if (self->mode != GST_DEINTERLACE_MODE_DISABLED) {
srccaps = gst_caps_make_writable (srccaps);
gst_caps_set_simple (srccaps, "interlace-method", G_TYPE_STRING,
gst_caps_set_simple (srccaps, "interlace-mode", G_TYPE_STRING,
"progressive", NULL);
}

11
tests/check/elements/deinterlace.c
View file

@ -249,7 +249,12 @@ deinterlace_check_passthrough (gint mode, const gchar * infiltercaps)
fail_unless (gst_element_set_state (pipeline, GST_STATE_PLAYING) !=
GST_STATE_CHANGE_FAILURE);
msg = gst_bus_poll (GST_ELEMENT_BUS (pipeline), GST_MESSAGE_EOS, -1);
msg = gst_bus_poll (GST_ELEMENT_BUS (pipeline),
GST_MESSAGE_ERROR | GST_MESSAGE_EOS, -1);
if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR) {
GST_ERROR ("ERROR: %" GST_PTR_FORMAT, msg);
fail ("Unexpected error message");
}
gst_message_unref (msg);
/* queue should be empty */
@ -283,11 +288,11 @@ deinterlace_set_caps_and_check (GstCaps * input, gboolean must_deinterlace)
othercaps = gst_caps_make_writable (othercaps);
s = gst_caps_get_structure (othercaps, 0);
gst_structure_remove_field (s, "interlaced");
gst_structure_remove_field (s, "interlace-mode");
input = gst_caps_make_writable (input);
s = gst_caps_get_structure (input, 0);
gst_structure_remove_field (s, "interlaced");
gst_structure_remove_field (s, "interlace-mode");
fail_unless (gst_caps_is_equal (input, othercaps));
}