Commit 0fcc448e authored by Thibault Saunier's avatar Thibault Saunier

tests: Handle the case where vaapi is installed and useable in encoder checks

We do say that vaapi encoder are "supported" (decoders are disabled) so
in the test we might get vaapi encoders showing up, we should just accept
parent df317712
Pipeline #5418 passed with stage
in 50 minutes and 52 seconds
......@@ -185,7 +185,7 @@ class TestRender(BaseTestMediaLibrary):
'muxer': "oggmux"}),
("test_ogg-vp8-opus", {
"aencoder": "opusenc",
"vencoder": "vp8enc",
"vencoder": ["vp8enc", "vaapivp8enc"],
"muxer": "oggmux"}),
("test_fullhd", {
"aencoder": "vorbisenc",
......@@ -196,7 +196,7 @@ class TestRender(BaseTestMediaLibrary):
"videorate": Gst.Fraction(120, 1)}),
("test_ogg-vp8-opus", {
"aencoder": "opusenc",
"vencoder": "vp8enc",
"vencoder": ["vp8enc", "vaapivp8enc"],
"muxer": "oggmux"}),
("test_fullhd", {
"aencoder": "vorbisenc",
......@@ -223,14 +223,15 @@ class TestRender(BaseTestMediaLibrary):
self.assertEqual(changed, [1], "Preset %s" % preset_name)
for attr, val in values.items():
val = val if isinstance(val, list) else [val]
combo = attr_dialog_widget_map.get(attr)
if combo:
combo_value = get_combo_value(combo)
if isinstance(combo_value, Gst.ElementFactory):
combo_value = combo_value.get_name()
self.assertEqual(combo_value, val, preset_name)
self.assertIn(combo_value, val, preset_name)
self.assertEqual(getattr(project, attr), val)
self.assertIn(getattr(project, attr), val)
@skipUnless(*factory_exists("vorbisenc", "theoraenc", "oggmux",
"opusenc", "vp8enc"))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment