From 4578beb545cae81fae6ec3547495e2e3ae8cdd2a Mon Sep 17 00:00:00 2001 From: totaam Date: Fri, 7 Oct 2022 20:45:27 +0700 Subject: [PATCH] #3592 simplify: just require 64-bit --- setup.py | 2 +- xpra/codecs/vpx/encoder.pyx | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 3a97094188..b16e51a7c7 100755 --- a/setup.py +++ b/setup.py @@ -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 diff --git a/xpra/codecs/vpx/encoder.pyx b/xpra/codecs/vpx/encoder.pyx index cf1e8914a8..b3fcd42e38 100644 --- a/xpra/codecs/vpx/encoder.pyx +++ b/xpra/codecs/vpx/encoder.pyx @@ -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