From 1d6269556282d2fa67c41ed81b6c8102c5df66f5 Mon Sep 17 00:00:00 2001
From: rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 24 Apr 2006 10:26:19 +0000
Subject: [PATCH] 1 - Remove kernel HZ=100 assumptions that are no longer true
 from timing.

Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18241 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/mplayer.c b/mplayer.c
index 1b0c596441..ea1999bb63 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3789,15 +3789,14 @@ if(time_frame>0.001 && !(vo_flags&256)){
 #else
     {
 	// -------- TIMER + SOFTSLEEP -----------
-	float min=softsleep?0.021:0.005;
+	// assume kernel HZ=100 for softsleep, works with larger HZ but with
+	// unnecessarily high CPU usage
+	float margin = softsleep ? 0.011 : 0;
 	current_module="sleep_timer";
-        while(time_frame>min){
-          if(time_frame<=0.020)
-             usec_sleep(0); // sleeps 1 clock tick (10ms)!
-          else
-             usec_sleep(1000000*(time_frame-0.020));
-          time_frame-=GetRelativeTime();
-        }
+	while (time_frame > margin) {
+	    usec_sleep(1000000 * (time_frame - margin));
+	    time_frame -= GetRelativeTime();
+	}
 	if(softsleep){
 	    current_module="sleep_soft";
 	    if(time_frame<0) mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow);