#2812 honour the ACK_JITTER instead of hard-coding another value

git-svn-id: https://xpra.org/svn/Xpra/trunk@28228 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/server/window/window_source.py

@@ -1500,7 +1500,10 @@ def get_packets_backlog(self):
             return 0
         latency_tolerance_pct = int(min(self._damage_packet_sequence, 10) *
                                     min(monotonic_time()-gs.last_congestion_time, 10))
-        return s.get_packets_backlog(latency_tolerance_pct)
+        latency = s.target_latency + ACK_JITTER/1000*(1+latency_tolerance_pct/100)
+        #log("get_packets_backlog() latency=%s (target=%i, tolerance=%i)",
+        #         1000*latency, 1000*s.target_latency, latency_tolerance_pct)
+        return s.get_late_acks(latency)
 
     def expire_delayed_region(self, due=0):
         """ mark the region as expired so damage_packet_acked can send it later,

src/xpra/server/window/window_stats.py

@@ -268,16 +268,10 @@ def get_late_acks(self, latency):
         #start_send_at = item[0]
         #end_send_at = item[3]
         late = sum(1 for item in self.damage_ack_pending.values() if item[3]>0 and item[0]<=sent_before)
-        log("get_late_acks(%i)=%i (%i in full pending list)",
+        log("get_late_acks(%s)=%i (%i in full pending list)",
             latency, late, len(self.damage_ack_pending))
         return late
 
-    def get_packets_backlog(self, latency_tolerance_pct=100):
-        latency = (self.target_latency+0.020)*latency_tolerance_pct/100.0
-        #log("get_packets_backlog(%i) latency=%s, target=%i",
-        #         latency_tolerance_pct, latency, self.target_latency)
-        return self.get_late_acks(latency)
-
     def get_pixels_encoding_backlog(self):
         pixels, count = 0, 0
         for _, w, h in self.encoding_pending.values():