Ticket #328: actual-video-size.patch

xpra/client/window_backing_base.py

@@ -223 +223 @@
         assert x==0 and y==0
         try:
             self._decoder_lock.acquire()
-            enc_width, enc_height = options.get("scaled_size", (width, height))
+            #the actual output size (after csc, if any)
+            out_width, out_height = options.get("video_size", (width, height))
+            #the encoding size (before csc/scaling)
+            enc_width, enc_height = options.get("scaled_size", (out_width, out_height))
             colorspace = options.get("csc")
             if not colorspace:
                 # Backwards compatibility with pre 0.10.x clients
@@ -256 +259 @@
             if not img:
                 raise Exception("paint_with_video_decoder: %s decompression error on %s bytes of picture data for %sx%s pixels, options=%s" % (
                       coding, len(img_data), width, height, options))
-            self.do_video_paint(img, x, y, enc_width, enc_height, width, height, options, callbacks)
+            self.do_video_paint(img, x, y, enc_width, enc_height, out_width, out_height, options, callbacks)
         finally:
             self._decoder_lock.release()
         return  False

xpra/server/window_video_source.py

@@ -505 +505 @@
                 #tell the client about scaling:
                 if self._csc_encoder and (enc_width!=width or enc_height!=height):
                     client_options["scaled_size"] = enc_width, enc_height
+                client_options["video_size"] = (width, height)
             debug("video_encode encoder: %s %sx%s result is %s bytes (%.1f MPixels/s), client options=%s",
                                 encoding, enc_width, enc_height, len(data), (enc_width*enc_height/(end-start+0.000001)/1024.0/1024.0), client_options)
             return Compressed(encoding, data), client_options, 0