Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* prevent bug with re-use of variable in inner loop (only manifests itself if there is more than one encoding tested)
* test more dimensions (stricter limits with nvenc + hevc)

git-svn-id: https://xpra.org/svn/Xpra/trunk@11895 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 9, 2016
1 parent c676948 commit cdc6e7f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/tests/xpra/codecs/test_encoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from xpra.log import Logger
log = Logger("encoder", "test")

DEFAULT_TEST_DIMENSIONS = [(32, 32), (1920, 1080), (512, 512)]
DEFAULT_TEST_DIMENSIONS = [(32, 32), (72, 72), (256, 256), (1920, 1080), (512, 512)]


def test_encoder_dimensions(encoder_module):
Expand Down Expand Up @@ -51,10 +51,10 @@ def test_encoder(encoder_module, options={}, dimensions=DEFAULT_TEST_DIMENSIONS,
ics = encoder_module.get_input_colorspaces(encoding)
log("input colorspaces(%s)=%s", encoding, ics)
for ic in ics:
for encoding in encoder_module.get_encodings():
ocs = encoder_module.get_output_colorspaces(encoding, ic)
for e in encoder_module.get_encodings():
ocs = encoder_module.get_output_colorspaces(e, ic)
for c in ocs:
log("spec(%s)=%s" % (c, encoder_module.get_spec(encoding, ic)))
log("spec(%s)=%s" % (c, encoder_module.get_spec(e, ic)))
for src_format in ics:
spec = encoder_module.get_spec(encoding, src_format)
for w,h in dimensions:
Expand Down

0 comments on commit cdc6e7f

Please sign in to comment.