Skip to content

Commit

Permalink
* RGB mode doesn't work on win32, disable it by default
Browse files Browse the repository at this point in the history
* fix logging message (missing arg)

git-svn-id: https://xpra.org/svn/Xpra/trunk@16455 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 22, 2017
1 parent e8bfb0e commit 2d67f28
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/xpra/codecs/nvenc/encoder.pyx
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 2d67f28

Please sign in to comment.