From 2d67f28c37df0a5c2509f4aec8a0d9e61ab5398b Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 22 Jul 2017 11:16:42 +0000 Subject: [PATCH] * RGB mode doesn't work on win32, disable it by default * fix logging message (missing arg) git-svn-id: https://xpra.org/svn/Xpra/trunk@16455 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/codecs/nvenc/encoder.pyx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xpra/codecs/nvenc/encoder.pyx b/src/xpra/codecs/nvenc/encoder.pyx index b8c2863ee7..96e94e45a3 100644 --- a/src/xpra/codecs/nvenc/encoder.pyx +++ b/src/xpra/codecs/nvenc/encoder.pyx @@ -39,7 +39,7 @@ cdef int MIN_COMPUTE = 0x30 cdef int YUV444_THRESHOLD = envint("XPRA_NVENC_YUV444_THRESHOLD", 85) cdef int LOSSLESS_THRESHOLD = envint("XPRA_NVENC_LOSSLESS_THRESHOLD", 100) -cdef int NATIVE_RGB = envbool("XPRA_NVENC_NATIVE_RGB", True) +cdef int NATIVE_RGB = envbool("XPRA_NVENC_NATIVE_RGB", not WIN32) cdef int LOSSLESS_ENABLED = envbool("XPRA_NVENC_LOSSLESS", True) cdef int YUV420_ENABLED = envbool("XPRA_NVENC_YUV420P", True) cdef int YUV444_ENABLED = envbool("XPRA_NVENC_YUV444P", True) @@ -2174,7 +2174,7 @@ cdef class Encoder: cdef do_compress_image(self, image, options={}): cdef unsigned int stride, w, h assert self.context, "context is not initialized" - log("compress_image(%s, %s) kernel_name=%s", image, options) + log("compress_image(%s, %s) kernel_name=%s", image, options, self.kernel_name) assert self.context!=NULL, "context is not initialized" w = image.get_width() h = image.get_height()