Skip to content
Snippets Groups Projects
Commit 0e5c4a86 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Fix FFmpeg test in case FFmpeg was not available at compile time

parent e7c8c376
No related branches found
No related tags found
No related merge requests found
...@@ -98,14 +98,16 @@ def test_format_codecs(): ...@@ -98,14 +98,16 @@ def test_format_codecs():
distortions['mpeg2video']['color'] = 9.0 distortions['mpeg2video']['color'] = 9.0
distortions['mpeg2video']['frameskip'] = 1.4 distortions['mpeg2video']['frameskip'] = 1.4
from .._externals import supported_videowriter_formats from .._externals import versions
SUPPORTED = supported_videowriter_formats() if versions['FFmpeg']['ffmpeg'] != 'unavailable':
for format in SUPPORTED: from .._externals import supported_videowriter_formats
for codec in SUPPORTED[format]['supported_codecs']: SUPPORTED = supported_videowriter_formats()
for method in methods: for format in SUPPORTED:
check_format_codec.description = "%s.test_%s_format_%s_codec_%s" % (__name__, method, format, codec) for codec in SUPPORTED[format]['supported_codecs']:
distortion = distortions.get(codec, distortions['default'])[method] for method in methods:
yield check_format_codec, methods[method], shape, framerate, format, codec, distortion check_format_codec.description = "%s.test_%s_format_%s_codec_%s" % (__name__, method, format, codec)
distortion = distortions.get(codec, distortions['default'])[method]
yield check_format_codec, methods[method], shape, framerate, format, codec, distortion
@testutils.ffmpeg_found() @testutils.ffmpeg_found()
def check_user_video(format, codec, maxdist): def check_user_video(format, codec, maxdist):
...@@ -179,10 +181,12 @@ def test_user_video(): ...@@ -179,10 +181,12 @@ def test_user_video():
msmpeg4v2 = 2.3, msmpeg4v2 = 2.3,
) )
from .._externals import supported_videowriter_formats from .._externals import versions
SUPPORTED = supported_videowriter_formats() if versions['FFmpeg']['ffmpeg'] != 'unavailable':
for format in SUPPORTED: from .._externals import supported_videowriter_formats
for codec in SUPPORTED[format]['supported_codecs']: SUPPORTED = supported_videowriter_formats()
check_user_video.description = "%s.test_user_video_format_%s_codec_%s" % (__name__, format, codec) for format in SUPPORTED:
distortion = distortions.get(codec, distortions['default']) for codec in SUPPORTED[format]['supported_codecs']:
yield check_user_video, format, codec, distortion check_user_video.description = "%s.test_user_video_format_%s_codec_%s" % (__name__, format, codec)
distortion = distortions.get(codec, distortions['default'])
yield check_user_video, format, codec, distortion
...@@ -71,6 +71,7 @@ def ffmpeg_version_lessthan(v): ...@@ -71,6 +71,7 @@ def ffmpeg_version_lessthan(v):
indicated as a string parameter.''' indicated as a string parameter.'''
from .._externals import versions from .._externals import versions
if versions['FFmpeg']['ffmpeg'] == 'unavailable': return False
avcodec_inst= SV(versions['FFmpeg']['avcodec']) avcodec_inst= SV(versions['FFmpeg']['avcodec'])
avcodec_req = ffmpeg_versions[v][0] avcodec_req = ffmpeg_versions[v][0]
return avcodec_inst < avcodec_req return avcodec_inst < avcodec_req
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment