diff options
| author | Thibault Saunier <tsaunier@gnome.org> | 2014-09-12 10:47:18 +0200 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@gnome.org> | 2014-09-12 11:26:48 +0200 |
| commit | b856d5985c0382cb967e120eae306addf61845c1 (patch) | |
| tree | e369010d57bed2c82d3f329793b91aeb0eae5e12 | |
| parent | 490a8f1ed9349d12bcdf4bbdbaed3569d7587804 (diff) | |
validate:launcher: Factorize code to get a MediaDescriptor name for classname
Instead of copy/pasting that code badly
| -rw-r--r-- | validate/tools/launcher/apps/gstvalidate.py | 8 | ||||
| -rw-r--r-- | validate/tools/launcher/baseclasses.py | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/validate/tools/launcher/apps/gstvalidate.py b/validate/tools/launcher/apps/gstvalidate.py index 2324c06..daa43ed 100644 --- a/validate/tools/launcher/apps/gstvalidate.py +++ b/validate/tools/launcher/apps/gstvalidate.py @@ -94,12 +94,9 @@ class GstValidateTranscodingTestsGenerator(GstValidateTestsGenerator): continue for comb in self.test_manager.get_encoding_formats(): - suffix = os.path.basename (mediainfo.media_descriptor.get_path()) - suffix = suffix.replace (".media_info", "") - suffix = suffix.replace (".stream_info", "") classname = "validate.%s.transcode.to_%s.%s" % (mediainfo.media_descriptor.get_protocol(), str(comb).replace(' ', '_'), - suffix.replace('.', '_')) + mediainfo.media_descriptor.get_clean_name()) self.add_test(GstValidateTranscodingTest(classname, self.test_manager.options, self.test_manager.reporter, @@ -184,8 +181,7 @@ class GstValidatePlaybinTestsGenerator(GstValidatePipelineTestsGenerator): fname = "%s.%s" % (self.get_fname(scenario, protocol), - os.path.basename(minfo.media_descriptor.get_path()).replace(".stream_info", - '').replace(".media_info", '')) + os.path.basename(minfo.media_descriptor.get_clean_name())) self.debug("Adding: %s", fname) if scenario.does_reverse_playback() and protocol == Protocols.HTTP: diff --git a/validate/tools/launcher/baseclasses.py b/validate/tools/launcher/baseclasses.py index 395451c..4069039 100644 --- a/validate/tools/launcher/baseclasses.py +++ b/validate/tools/launcher/baseclasses.py @@ -1219,6 +1219,11 @@ class GstValidateMediaDescriptor(MediaDescriptor): return n + def get_clean_name(self): + name = os.path.basename(self.get_path()) + name = re.sub("\.stream_info|\.media_info", "", name) + + return name.replace('.', "_") class MediaFormatCombination(object): _FORMATS = {"aac": "audio/mpeg,mpegversion=4", |