Skip to content

Commit

Permalink
#3592 simplify: just require 64-bit
Browse files Browse the repository at this point in the history
  • Loading branch information
totaam committed Oct 7, 2022
1 parent 716151c commit 4578beb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def has_header_file(name, isdir=False):
jpeg_encoder_ENABLED = DEFAULT and pkg_config_version("1.2", "libturbojpeg")
jpeg_decoder_ENABLED = DEFAULT and pkg_config_version("1.4", "libturbojpeg")
avif_ENABLED = DEFAULT and pkg_config_version("0.9", "libavif") and not OSX
vpx_ENABLED = DEFAULT and pkg_config_version("1.8", "vpx")
vpx_ENABLED = DEFAULT and pkg_config_version("1.8", "vpx") and BITS==64
enc_ffmpeg_ENABLED = DEFAULT and BITS==64 and pkg_config_version("58.18", "libavcodec")
#opencv currently broken on 32-bit windows (crashes on load):
webcam_ENABLED = DEFAULT and not OSX and not WIN32
Expand Down
6 changes: 0 additions & 6 deletions xpra/codecs/vpx/encoder.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,6 @@ cdef class Encoder:
assert options.get("scaled-height", height)==height, "vpx encoder does not handle scaling"
assert encoding in get_encodings()
assert src_format in get_input_colorspaces(encoding)
if BITS==32 and WIN32:
dmaxw, dmaxh = MAX_SIZE[encoding]
if width>dmaxw or height>dmaxh:
#this can crash on win32, don't even try it
#(the unit tests would otherwise crash)
raise Exception("invalid dimensions %ix%i - maximum is %ix%i" % (width, height, dmaxw, dmaxh))

self.src_format = src_format

Expand Down

0 comments on commit 4578beb

Please sign in to comment.