mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Remove protocol-specific timeouts

Browse source 
Since we now check position/status of pipeline at regular intevals,
we no longer need to impose a different timeout based on the
protocol used.

Avoids having 4min long timeouts for no reason (30s is enough)
This commit is contained in:
Edward Hervey 2017-12-03 12:23:51 +01:00 committed by Edward Hervey
parent 92285ef261
commit 01a54641f9
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
validate/launcher/apps/gstvalidate.py
View file

@ -68,10 +68,6 @@ Some info about protocols and how to handle them
""" """
GST_VALIDATE_CAPS_TO_PROTOCOL = [("application/x-hls", Protocols.HLS), GST_VALIDATE_CAPS_TO_PROTOCOL = [("application/x-hls", Protocols.HLS),
("application/dash+xml", Protocols.DASH)] ("application/dash+xml", Protocols.DASH)]
GST_VALIDATE_PROTOCOL_TIMEOUTS = {Protocols.HTTP: 120,
Protocols.HLS: 240,
Protocols.RTSP: 240,
Protocols.DASH: 240}
class GstValidateMediaCheckTestsGenerator(GstValidateTestsGenerator): class GstValidateMediaCheckTestsGenerator(GstValidateTestsGenerator):
@ -82,10 +78,7 @@ class GstValidateMediaCheckTestsGenerator(GstValidateTestsGenerator):
def populate_tests(self, uri_minfo_special_scenarios, scenarios): def populate_tests(self, uri_minfo_special_scenarios, scenarios):
for uri, mediainfo, special_scenarios in uri_minfo_special_scenarios: for uri, mediainfo, special_scenarios in uri_minfo_special_scenarios:
protocol = mediainfo.media_descriptor.get_protocol() protocol = mediainfo.media_descriptor.get_protocol()
try: timeout = DEFAULT_TIMEOUT
timeout = GST_VALIDATE_PROTOCOL_TIMEOUTS[protocol]
except KeyError:
timeout = DEFAULT_TIMEOUT
classname = "%s.media_check.%s" % (protocol, classname = "%s.media_check.%s" % (protocol,
os.path.basename(url2path(uri)).replace(".", "_")) os.path.basename(url2path(uri)).replace(".", "_"))
@ -447,14 +440,6 @@ class GstValidateLaunchTest(GstValidateTest):
extra_env_variables = extra_env_variables or {} extra_env_variables = extra_env_variables or {}
try:
timeout = GST_VALIDATE_PROTOCOL_TIMEOUTS[
media_descriptor.get_protocol()]
except KeyError:
pass
except AttributeError:
pass
if scenario: if scenario:
duration = scenario.get_duration() duration = scenario.get_duration()
elif media_descriptor: elif media_descriptor:
@ -527,12 +512,6 @@ class GstValidateTranscodingTest(GstValidateTest, GstValidateEncodingTestInterfa
else: else:
duration = file_dur duration = file_dur
try:
timeout = GST_VALIDATE_PROTOCOL_TIMEOUTS[
media_descriptor.get_protocol()]
except KeyError:
pass
super( super(
GstValidateTranscodingTest, self).__init__(GST_VALIDATE_TRANSCODING_COMMAND, GstValidateTranscodingTest, self).__init__(GST_VALIDATE_TRANSCODING_COMMAND,
classname, classname,