diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2012-08-26 22:08:54 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2012-08-27 21:20:29 +0100 |
| commit | 045c4b6ec80c469790afdb5e4126441841c98673 (patch) | |
| tree | a4aa42ad27febebffd043d984ebc464a652cc3d9 /tests | |
| parent | d35fbcf6f1ee340b8ad643e5d5dec3992d507246 (diff) | |
deinterlace: the field in caps is "interlace-mode" not "interlace-method"
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/elements/deinterlace.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/check/elements/deinterlace.c b/tests/check/elements/deinterlace.c index 258c8750a..c25cbccda 100644 --- a/tests/check/elements/deinterlace.c +++ b/tests/check/elements/deinterlace.c @@ -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)); } |