Changeset 1195 in xpra

Timestamp:

07/27/12 12:41:44 (10 months ago)

Author:

antoine

Message:

increase slope to avoid division by close to zero when average is zero, also provide utility function to lookup video encoders (to hookup change encoding speed functions)

Location:

trunk/src/xpra

Files:

• maths.py (modified) (1 diff)
• server_source.py (modified) (3 diffs)

trunk/src/xpra/maths.py

@@ -170 +170 @@
     avg, recent = calculate_time_weighted_average(list(time_values))
     msg = "%s avg=%s, recent=%s, target=%s" % (msg_header, avg, recent, target)
-    return  calculate_for_target(msg, target, avg, recent, aim=0.25, div=div, slope=0.01)
+    return  calculate_for_target(msg, target, avg, recent, aim=0.25, div=div, slope=1.0)

trunk/src/xpra/server_source.py

@@ -595 +595 @@
         #packet and pixels backlog:
         last_packets_backlog, last_pixels_backlog = self._last_client_delta
-        factors.append(calculate_for_target("client packets backlog", 0, last_packets_backlog, packets_backlog, slope=1))
-        factors.append(calculate_for_target("client pixels backlog", 0, last_pixels_backlog, pixels_backlog, div=low_limit, slope=0.1))
+        factors.append(calculate_for_target("client packets backlog", 0, last_packets_backlog, packets_backlog, slope=1.0))
+        factors.append(calculate_for_target("client pixels backlog", 0, last_pixels_backlog, pixels_backlog, div=low_limit, slope=1.0))
         if self._mmap and self._mmap_size>0:
             #full: effective range is 0.0 to ~1.2
@@ -1026 +1026 @@
         return data
 
+    def video_encoders(self, coding):
+        assert coding in ENCODINGS
+        if coding=="x264":
+            from xpra.x264.codec import ENCODERS as x264_encoders, Encoder as x264Encoder   #@UnresolvedImport
+            return x264_encoders, x264Encoder
+        elif coding=="vpx":
+            from xpra.vpx.codec import ENCODERS as vpx_encoders, Encoder as vpxEncoder      #@UnresolvedImport
+            return vpx_encoders, vpxEncoder
+        else:
+            raise Exception("invalid video encoder: %s" % coding)
+
     def video_encode(self, wid, x, y, w, h, coding, data, rowstride):
         """
@@ -1036 +1047 @@
 
         """
-        assert coding in ENCODINGS
         assert x==0 and y==0, "invalid position: %sx%s" % (x,y)
-        if coding=="x264":
-            from xpra.x264.codec import ENCODERS as x264_encoders, Encoder as x264Encoder   #@UnresolvedImport
-            encoders = x264_encoders
-            factory = x264Encoder
-        elif coding=="vpx":
-            from xpra.vpx.codec import ENCODERS as vpx_encoders, Encoder as vpxEncoder      #@UnresolvedImport
-            encoders = vpx_encoders
-            factory = vpxEncoder
-        else:
-            raise Exception("invalid video encoder: %s" % coding)
+        encoders, factory = self.video_encoders(coding)
         #time_before = time.clock()
         try: