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

Fix more references to _externals -> version

parent 0359fcbe
Branches
Tags
No related merge requests found
......@@ -29,7 +29,7 @@ from .. import test_utils
def list_codecs(*args, **kwargs):
from .._externals import supported_video_codecs, available_video_codecs
from ..version import supported_video_codecs, available_video_codecs
CODECS = supported_video_codecs()
ALL_CODECS = available_video_codecs()
......@@ -44,7 +44,7 @@ def list_codecs(*args, **kwargs):
def list_all_codecs(*args, **kwargs):
from .._externals import supported_video_codecs, available_video_codecs
from ..version import supported_video_codecs, available_video_codecs
CODECS = supported_video_codecs()
ALL_CODECS = available_video_codecs()
......@@ -60,7 +60,7 @@ def list_all_codecs(*args, **kwargs):
def list_formats(*args, **kwargs):
from .._externals import supported_videowriter_formats, available_videowriter_formats
from ..version import supported_videowriter_formats, available_videowriter_formats
FORMATS = supported_videowriter_formats()
ALL_FORMATS = available_videowriter_formats()
......@@ -75,7 +75,7 @@ def list_formats(*args, **kwargs):
def list_all_formats(*args, **kwargs):
from .._externals import supported_videowriter_formats, available_videowriter_formats
from ..version import supported_videowriter_formats, available_videowriter_formats
FORMATS = supported_videowriter_formats()
ALL_FORMATS = available_videowriter_formats()
......@@ -272,7 +272,7 @@ def detail(function, shape, framerate, format, codec, outdir):
def main(user_input=None):
from .._library import __version__
from .._externals import supported_video_codecs, available_video_codecs, supported_videowriter_formats, available_videowriter_formats
from ..version import supported_video_codecs, available_video_codecs, supported_videowriter_formats, available_videowriter_formats
from .. import test as io_test
parser = argparse.ArgumentParser(description=__doc__, epilog=__epilog__,
......
......@@ -124,7 +124,7 @@ def codec_available(codec):
@functools.wraps(test)
def wrapper(*args, **kwargs):
from ._externals import supported_video_codecs
from .version import supported_video_codecs
d = supported_video_codecs()
if codec in d and d[codec]['encode'] and d[codec]['decode']:
return test(*args, **kwargs)
......@@ -142,7 +142,7 @@ def extension_available(extension):
@functools.wraps(test)
def wrapper(*args, **kwargs):
from ._externals import extensions
from .version import extensions
if extension in extensions():
return test(*args, **kwargs)
else:
......
......@@ -19,7 +19,7 @@ INPUT_VIDEO = test_utils.datafile('test.mov', __name__)
def test_codec_support():
# Describes all encoders
from ._externals import describe_encoder, describe_decoder, supported_video_codecs
from .version import describe_encoder, describe_decoder, supported_video_codecs
supported = supported_video_codecs()
......@@ -38,7 +38,7 @@ def test_codec_support():
def test_input_format_support():
# Describes all encoders
from ._externals import supported_videoreader_formats
from .version import supported_videoreader_formats
supported = supported_videoreader_formats()
......@@ -50,7 +50,7 @@ def test_input_format_support():
def test_output_format_support():
# Describes all encoders
from ._externals import supported_videowriter_formats
from .version import supported_videowriter_formats
supported = supported_videowriter_formats()
......
......@@ -98,9 +98,9 @@ def test_format_codecs():
distortions['mpeg2video']['color'] = 9.0
distortions['mpeg2video']['frameskip'] = 1.4
from ._externals import versions
if versions['FFmpeg']['ffmpeg'] != 'unavailable':
from ._externals import supported_videowriter_formats
from .version import externals
if externals['FFmpeg']['ffmpeg'] != 'unavailable':
from .version import supported_videowriter_formats
SUPPORTED = supported_videowriter_formats()
for format in SUPPORTED:
for codec in SUPPORTED[format]['supported_codecs']:
......@@ -181,9 +181,9 @@ def test_user_video():
msmpeg4v2 = 2.3,
)
from ._externals import versions
if versions['FFmpeg']['ffmpeg'] != 'unavailable':
from ._externals import supported_videowriter_formats
from .version import externals
if externals['FFmpeg']['ffmpeg'] != 'unavailable':
from .version import supported_videowriter_formats
SUPPORTED = supported_videowriter_formats()
for format in SUPPORTED:
for codec in SUPPORTED[format]['supported_codecs']:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment