From 617191504a522a260e35bd9cc50817f7b6010e06 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Jul 2023 22:36:09 +0200 Subject: [PATCH] #3592 missed from 20bb5f04233dc650022bc67d5904566d1b158af9 --- tests/xpra/codecs/test_single_frame_video.py | 2 -- xpra/codecs/loader.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/xpra/codecs/test_single_frame_video.py b/tests/xpra/codecs/test_single_frame_video.py index 87bab7fef1..9754fc069d 100755 --- a/tests/xpra/codecs/test_single_frame_video.py +++ b/tests/xpra/codecs/test_single_frame_video.py @@ -17,9 +17,7 @@ def main(files): assert len(files)>0, "specify images to use for benchmark" avcodec = load_codec("dec_avcodec2") - swscale = load_codec("csc_swscale") assert avcodec, "dec_avcodec is required" - assert swscale, "swscale is required" encoders = [] ENCODERS = os.environ.get("XPRA_ENCODERS", "enc_vpx,enc_x264,enc_x265,nvenc,enc_ffmpeg").split(",") for encoder in ENCODERS: diff --git a/xpra/codecs/loader.py b/xpra/codecs/loader.py index 61cf882b5f..28773a2799 100755 --- a/xpra/codecs/loader.py +++ b/xpra/codecs/loader.py @@ -38,7 +38,7 @@ def filt(*values) -> Tuple[str,...]: return tuple(x for x in values if all(x.find(s)<0 for s in SKIP_LIST)) -CSC_CODECS : Tuple[str,...] = filt("csc_swscale", "csc_cython", "csc_libyuv") +CSC_CODECS : Tuple[str,...] = filt("csc_cython", "csc_libyuv") ENCODER_CODECS : Tuple[str,...] = filt("enc_rgb", "enc_pillow", "enc_spng", "enc_webp", "enc_jpeg", "enc_nvjpeg", "enc_avif") ENCODER_VIDEO_CODECS : Tuple[str,...] = filt("enc_vpx", "enc_x264", "enc_x265", "enc_openh264", "nvenc", "enc_gstreamer") DECODER_CODECS : Tuple[str,...] = filt("dec_pillow", "dec_spng", "dec_webp", "dec_jpeg", "dec_nvjpeg", "dec_avif", "dec_gstreamer")