#3504 free buffers as soon as possible, log alpha channel merge cost

Xpra-org · Apr 8, 2022 · a8603b5 · a8603b5
1 parent da07790
commit a8603b5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/xpra/codecs/nvjpeg/decoder.pyx b/xpra/codecs/nvjpeg/decoder.pyx
@@ -193,6 +193,7 @@ def decompress_with_device(rgb_format, img_data, options=None, download=None):
                     memcpy.set_dst_device(buf)
                     memcpy.height = width*height
                     memcpy(aligned=False)
+                    rgb.free()
                     #fill in the alpha channel:
                     memcpy = Memcpy2D()
                     memcpy.src_x_in_bytes = memcpy.src_y = memcpy.dst_y = 0
@@ -204,9 +205,10 @@ def decompress_with_device(rgb_format, img_data, options=None, download=None):
                     memcpy.set_dst_device(buf)
                     memcpy.height = alpha_size
                     memcpy(aligned=False)
-                    rgb_format += "A"
-                    rgb.free()
                     alpha.free()
+                    end = monotonic()
+                    log("alpha merge took %ims", 1000*(end-start))
+                    rgb_format += "A"
                     buf_size = rgb_size+alpha_size
                 else:
                     buf = rgb