Ticket #999: delay-refresh.patch

xpra/server/window/video_subregion.py

@@ -79 +79 @@
         #keep track of how much extra we batch non-video regions (milliseconds):
         self.non_max_wait = 150
         self.min_time = monotonic_time()
+        self.min_refresh_time = 0
 
     def reset(self):
         self.cancel_refresh_timer()
@@ -150 +151 @@
                      "set-at"       : self.set_at,
                      "time"         : int(self.time),
                      "min-time"     : int(self.min_time),
+                     "min-refresh-time"  : int(self.min_refresh_time),
                      "non-max-wait" : self.non_max_wait,
                      "in-out"       : self.inout,
                      "score"        : self.score,
@@ -191 +193 @@
         for r in self.refresh_regions:
             if not rect.contains_rect(r):
                 non_video += r.substract_rect(rect)
-        delay = max(150, self.auto_refresh_delay)
+        now = monotonic_time()
+        delay = max(150, self.min_refresh_time-now, self.auto_refresh_delay)
         if non_video:
             #refresh via timeout_add so this will run in the UI thread:
             self.timeout_add(delay, self.refresh_cb, non_video)
@@ -200 +203 @@
             self.refresh_regions = [r for r in inrect if r is not None]
         #re-schedule the video region refresh (if we have regions to fresh):
         if self.refresh_regions:
-            self.refresh_timer = self.timeout_add(delay, self.refresh)
+            pass
+            #self.refresh_timer = self.timeout_add(delay, self.refresh)
 
     def refresh(self):
         #runs via timeout_add, safe to call UI!
@@ -216 +220 @@
         refreshlog("refresh() calling %s with regions=%s", self.refresh_cb, regions)
         self.refresh_cb(regions)
 
+    def reschedule_refresh(self):
+        rt = self.refresh_timer
+        if rt:
+            self.source_remove(rt)
+            now = monotonic_time()
+            delay = max(150, self.min_refresh_time-now, self.auto_refresh_delay)
+            self.refresh_timer = self.timeout_add(delay, self.refresh)
 
+
     def novideoregion(self, msg="", *args):
         sslog("novideoregion: "+msg, *args)
         self.rectangle = None

xpra/server/window/window_source.py

@@ -1815 +1815 @@
             statslog("record_congestion_event(%i) %iKbps", late_pct, send_speed/1024)
             gs.congestion_send_speed.append((now, late_pct, send_speed))
             gs.last_congestion_time = now
+        self.delay_refresh(5)
 
+    def delay_refresh(self, delay):
+        log.info("delay_refresh(%i)", delay)
+        #push it back:
+        rtt = self.refresh_target_time
+        if rtt:
+            self.refresh_target_time = rtt+delay
+
+
     def damage_packet_acked(self, damage_packet_sequence, width, height, decode_time, message):
         """
             The client is acknowledging a damage packet,

xpra/server/window/window_video_source.py

@@ -545 +545 @@
         WindowSource.timer_full_refresh(self)
 
 
+    def delay_refresh(self, delay):
+        WindowSource.delay_refresh(self, delay)
+        self.video_subregion.min_refresh_time = monotonic_time()+delay
+        self.video_subregion.reschedule_refresh()
+
+
     def get_refresh_exclude(self):
         #exclude video region (if any) from lossless refresh:
         return self.video_subregion.rectangle