Ticket #1765: gl-yuva.patch

xpra/client/gl/gl_window_backing_base.py

@@ -1 +1 @@
 # This file is part of Xpra.
 # Copyright (C) 2013 Serviware (Arthur Huillet, <ahuillet@serviware.com>)
-# Copyright (C) 2012-2019 Antoine Martin <antoine@xpra.org>
+# Copyright (C) 2012-2020 Antoine Martin <antoine@xpra.org>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
@@ -15 +15 @@
     GL_UNPACK_ROW_LENGTH, GL_UNPACK_ALIGNMENT,
     GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_NEAREST,
     GL_UNSIGNED_BYTE, GL_LUMINANCE, GL_LINEAR,
-    GL_TEXTURE0, GL_TEXTURE1, GL_TEXTURE2, GL_QUADS, GL_LINE_LOOP, GL_LINES, GL_COLOR_BUFFER_BIT,
+    GL_TEXTURE0, GL_TEXTURE1, GL_TEXTURE2, GL_TEXTURE3,
+    GL_QUADS, GL_LINE_LOOP, GL_LINES, GL_COLOR_BUFFER_BIT,
     GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER,
     GL_DONT_CARE, GL_TRUE, GL_DEPTH_TEST, GL_SCISSOR_TEST, GL_LIGHTING, GL_DITHER,
     GL_RGB, GL_RGBA, GL_BGR, GL_BGRA, GL_RGBA8, GL_RGB8, GL_RGB10_A2, GL_RGB565, GL_RGB5_A1, GL_RGBA4,
@@ -63 +64 @@
     WEBP_PILLOW, SCROLL_ENCODING,
     )
 from xpra.client.gl.gl_check import GL_ALPHA_SUPPORTED, is_pyopengl_memoryview_safe, get_max_texture_size
-from xpra.client.gl.gl_colorspace_conversions import YUV2RGB_shader, YUV2RGB_FULL_shader, RGBP2RGB_shader
+from xpra.client.gl.gl_colorspace_conversions import (
+    YUV2RGB_shader, YUV2RGB_FULL_shader, RGBP2RGB_shader, YUVA2RGBA_shader,
+    )
 from xpra.client.gl.gl_spinner import draw_spinner
 from xpra.log import Logger
 
@@ -200 +203 @@
 TEX_Y = 0
 TEX_U = 1
 TEX_V = 2
-TEX_RGB = 3
-TEX_FBO = 4         #FBO texture (guaranteed up-to-date window contents)
-TEX_TMP_FBO = 5
-TEX_CURSOR = 6
-N_TEXTURES = 7
+TEX_A = 3
+TEX_RGB = 4
+TEX_FBO = 5         #FBO texture (guaranteed up-to-date window contents)
+TEX_TMP_FBO = 6
+TEX_CURSOR = 7
+N_TEXTURES = 8
 
 # Shader number assignment
 YUV2RGB_SHADER = 0
 RGBP2RGB_SHADER = 1
 YUV2RGB_FULL_SHADER = 2
+YUVA2RGBA_SHADER = 3
 
+SHADER_STR = {
+    YUV2RGB_SHADER      : "YUV2RGB",
+    RGBP2RGB_SHADER     : "RGBP2RGB",
+    YUV2RGB_FULL_SHADER : "YUV2RGB_FULL",
+    YUVA2RGBA_SHADER    : "YUVA2RGBA",
+    }
 
 """
 The logic is as follows:
@@ -450 +461 @@
         for name, progid, progstr in (
             ("YUV2RGB",     YUV2RGB_SHADER,         YUV2RGB_shader),
             ("YUV2RGBFULL", YUV2RGB_FULL_SHADER,    YUV2RGB_FULL_shader),
+            ("YUVA2RGBA",   YUVA2RGBA_SHADER,       YUVA2RGBA_shader),
             ("RGBP2RGB",    RGBP2RGB_SHADER,        RGBP2RGB_shader),
             ):
             glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, self.shaders[progid])
@@ -1007 +1019 @@
     def paint_webp(self, img_data, x : int, y : int, width : int, height : int, options, callbacks):
         subsampling = options.strget("subsampling")
         has_alpha = options.boolget("has_alpha")
-        if subsampling=="YUV420P" and WEBP_YUV and self.webp_decoder and not WEBP_PILLOW and not has_alpha and width>=2 and height>=2:
+        if subsampling=="YUV420P" and WEBP_YUV and self.webp_decoder and not WEBP_PILLOW and width>=2 and height>=2:
             img = self.webp_decoder.decompress_yuv(img_data)
             flush = options.intget("flush", 0)
             w = img.get_width()
             h = img.get_height()
-            self.idle_add(self.gl_paint_planar, YUV2RGB_SHADER, flush, "webp", img,
+            if has_alpha:
+                shader = YUVA2RGBA_SHADER
+            else:
+                shader = YUV2RGB_SHADER
+            self.idle_add(self.gl_paint_planar, shader, flush, "webp", img,
                           x, y, w, h, width, height, options, callbacks)
             return
         super().paint_webp(img_data, x, y, width, height, options, callbacks)
@@ -1112 +1128 @@
                         x : int, y : int, enc_width : int, enc_height : int, width : int, height : int,
                         options, callbacks):
         #this function runs in the UI thread, no video_decoder lock held
-        log("gl_paint_planar%s", (flush, encoding, img, x, y, enc_width, enc_height, width, height, options, callbacks))
+        log("gl_paint_planar%s", (SHADER_STR.get(shader, shader), flush, encoding, img,
+                                  x, y, enc_width, enc_height, width, height,
+                                  options, callbacks))
         x, y = self.gravity_adjust(x, y, options)
         try:
             pixel_format = img.get_pixel_format()
-            assert pixel_format in ("YUV420P", "YUV422P", "YUV444P", "GBRP"), \
+            assert pixel_format in ("YUV420P", "YUV422P", "YUV444P", "GBRP", "YUVA"), \
                 "sorry the GL backing does not handle pixel format '%s' yet!" % (pixel_format)
 
             context = self.gl_context()
@@ -1164 +1182 @@
             self.pixel_format = pixel_format
             self.texture_size = (width, height)
             # Create textures of the same size as the window's
-            for texture, index in ((GL_TEXTURE0, TEX_Y), (GL_TEXTURE1, TEX_U), (GL_TEXTURE2, TEX_V)):
-                (div_w, div_h) = divs[index]
+            for texture, index in (
+                (GL_TEXTURE0, TEX_Y),
+                (GL_TEXTURE1, TEX_U),
+                (GL_TEXTURE2, TEX_V),
+                (GL_TEXTURE3, TEX_A),
+                ):
+                div_w, div_h = divs[index]
                 glActiveTexture(texture)
                 target = GL_TEXTURE_RECTANGLE_ARB
                 glBindTexture(target, self.textures[index])

xpra/client/gl/gl_colorspace_conversions.py

@@ -43 +43 @@
 # 10 instructions, 2 R-regs
 """
 
+YUVA2RGBA_shader = b"""!!ARBfp1.0
+# cgc version 3.1.0010, build date Feb 10 2012
+# command line args: -profile arbfp1
+# source file: yuv.cg
+#vendor NVIDIA Corporation
+#version 3.1.0.10
+#profile arbfp1
+#program main
+#semantic main.IN
+#var float2 IN.texcoord1 : $vin.TEXCOORD0 : TEX0 : 0 : 1
+#var float2 IN.texcoord2 : $vin.TEXCOORD1 : TEX1 : 0 : 1
+#var float2 IN.texcoord3 : $vin.TEXCOORD2 : TEX2 : 0 : 1
+#var float2 IN.texcoord4 : $vin.TEXCOORD2 : TEX3 : 0 : 1
+#var samplerRECT IN.texture1 : TEXUNIT0 : texunit 0 : 0 : 1
+#var samplerRECT IN.texture2 : TEXUNIT1 : texunit 1 : 0 : 1
+#var samplerRECT IN.texture3 : TEXUNIT2 : texunit 2 : 0 : 1
+#var samplerRECT IN.texture4 : TEXUNIT3 : texunit 3 : 0 : 1
+#var float4 IN.color : $vin.COLOR0 : COL0 : 0 : 1
+#var float4 main.color : $vout.COLOR0 : COL : -1 : 1
+#const c[0] = 1.1643835 2.017231 0 0.5
+#const c[1] = 0.0625 1.1643835 -0.3917616 -0.81296802
+#const c[2] = 1.1643835 0 1.5960271
+    PARAM c[3] = { { 1.1643835, 2.017231, 0, 0.5 },
+            { 0.0625, 1.1643835, -0.3917616, -0.81296802 },
+            { 1.1643835, 0, 1.5960271 } };
+    TEMP R0;
+    TEMP R1;
+    TEX R0.x, fragment.texcoord[2], texture[2], RECT;
+    ADD R1.z, R0.x, -c[0].w;
+    TEX R1.x, fragment.texcoord[0], texture[0], RECT;
+    TEX R0.x, fragment.texcoord[1], texture[1], RECT;
+    ADD R1.x, R1, -c[1];
+    ADD R1.y, R0.x, -c[0].w;
+    DP3 result.color.z, R1, c[0];
+    DP3 result.color.y, R1, c[1].yzww;
+    DP3 result.color.x, R1, c[2];
+    MOV result.color.w, fragment.texcoord[3];
+    END
+# 10 instructions, 2 R-regs
+"""
+
 YUV2RGB_FULL_shader = b"""!!ARBfp1.0
 # cgc version 3.0.0016, build date Feb 13 2011
 # command line args: -profile arbfp1