[Spice-devel] [spice v2] server: Simplify the MJPEG encoder's maximum framerate estimation

[Francois Gouget]

Note that if frame_size == bytes_per_sec == 0 this now returns
MJPEG_MAX_FPS but this should not happen anyway.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 server/mjpeg_encoder.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
index 9b331c1..0529232 100644
--- a/server/mjpeg_encoder.c
+++ b/server/mjpeg_encoder.c
@@ -341,15 +341,7 @@ static inline uint32_t mjpeg_encoder_get_latency(MJpegEncoder *encoder)
 
 static uint32_t get_max_fps(uint64_t frame_size, uint64_t bytes_per_sec)
 {
-    double fps;
-    double send_time_ms;
-
-    if (!bytes_per_sec) {
-        return 0;
-    }
-    send_time_ms = frame_size * 1000.0 / bytes_per_sec;
-    fps = send_time_ms ? 1000 / send_time_ms : MJPEG_MAX_FPS;
-    return fps;
+    return frame_size ? bytes_per_sec / frame_size : MJPEG_MAX_FPS;
 }
 
 static inline void mjpeg_encoder_reset_quality(MJpegEncoder *encoder,
-- 
2.6.2