allow us to force enable YUV444P support using env var (so we can for…

…ce enable and test newer driver versions) git-svn-id: https://xpra.org/svn/Xpra/trunk@11303 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Nov 20, 2015 · d881cca · d881cca
1 parent 20fb046
commit d881cca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/xpra/codecs/nvenc4/encoder.pyx b/src/xpra/codecs/nvenc4/encoder.pyx
@@ -2328,14 +2328,17 @@ def init_module():
     v = get_nvidia_module_version()
     if not v:
         log.warn("Warning: unknown NVidia driver version")
+        bl = None
     else:
         bl = is_blacklisted()
-        if bl is True:
-            raise Exception("NVidia driver version %s is blacklisted, it does not work with NVENC" % pver(v))
-        elif bl is None:
-            log.warn("Warning: NVidia driver version %s may or may not work", pver(v))
-            log.warn(" recommended driver versions: up to 350 only")
+    if bl is True:
+        raise Exception("NVidia driver version %s is blacklisted, it does not work with NVENC" % pver(v))
+    elif bl is None:
+        log.warn("Warning: NVidia driver version %s may or may not work", pver(v))
+        log.warn(" recommended driver versions: up to 350 only")
+        if os.environ.get("XPRA_NVENC_YUV444P", "0")!="1":
             log.warn(" disabling YUV444P support")
+            log.warn(" use XPRA_NVENC_YUV444P=1 to force enable it")
             YUV444_ENABLED = False
 
     #load the library / DLL:

diff --git a/src/xpra/codecs/nvenc5/encoder.pyx b/src/xpra/codecs/nvenc5/encoder.pyx
@@ -2363,14 +2363,17 @@ def init_module():
     v = get_nvidia_module_version()
     if not v:
         log.warn("Warning: unknown NVidia driver version")
+        bl = None
     else:
         bl = is_blacklisted()
-        if bl is True:
-            raise Exception("NVidia driver version %s is blacklisted, it does not work with NVENC" % pver(v))
-        elif bl is None:
-            log.warn("Warning: NVidia driver version %s may or may not work", pver(v))
-            log.warn(" recommended driver versions: up to 350 only")
+    if bl is True:
+        raise Exception("NVidia driver version %s is blacklisted, it does not work with NVENC" % pver(v))
+    elif bl is None:
+        log.warn("Warning: NVidia driver version %s may or may not work", pver(v))
+        log.warn(" recommended driver versions: up to 350 only")
+        if os.environ.get("XPRA_NVENC_YUV444P", "0")!="1":
             log.warn(" disabling YUV444P support")
+            log.warn(" use XPRA_NVENC_YUV444P=1 to force enable it")
             YUV444_ENABLED = False
 
     #load the library / DLL: