comparison osdep/timer-darwin.c @ 29263:0f1b5b68af32

whitespace cosmetics: Remove all trailing whitespace.
author diego
date Wed, 13 May 2009 02:58:57 +0000
parents eda346733b8c
children cfb6e0b4e2bd
comparison
equal deleted inserted replaced
29262:7d545a6b8aff 29263:0f1b5b68af32
36 36
37 /* the core sleep function, uses floats and is used in MPlayer G2 */ 37 /* the core sleep function, uses floats and is used in MPlayer G2 */
38 float sleep_accurate(float time_frame) 38 float sleep_accurate(float time_frame)
39 { 39 {
40 uint64_t deadline = time_frame / timebase_ratio + mach_absolute_time(); 40 uint64_t deadline = time_frame / timebase_ratio + mach_absolute_time();
41 41
42 mach_wait_until(deadline); 42 mach_wait_until(deadline);
43 43
44 return (mach_absolute_time() - deadline) * timebase_ratio; 44 return (mach_absolute_time() - deadline) * timebase_ratio;
45 } 45 }
46 46
47 /* wrapper for MPlayer G1 */ 47 /* wrapper for MPlayer G1 */
48 int usec_sleep(int usec_delay) 48 int usec_sleep(int usec_delay)
65 65
66 /* time spent between now and last call in seconds */ 66 /* time spent between now and last call in seconds */
67 float GetRelativeTime(void) 67 float GetRelativeTime(void)
68 { 68 {
69 double last_time = relative_time; 69 double last_time = relative_time;
70 70
71 if (!relative_time) 71 if (!relative_time)
72 InitTimer(); 72 InitTimer();
73 73
74 relative_time = mach_absolute_time() * timebase_ratio; 74 relative_time = mach_absolute_time() * timebase_ratio;
75 75
76 return (float)(relative_time-last_time); 76 return (float)(relative_time-last_time);
77 } 77 }
78 78
80 void InitTimer(void) 80 void InitTimer(void)
81 { 81 {
82 struct mach_timebase_info timebase; 82 struct mach_timebase_info timebase;
83 83
84 mach_timebase_info(&timebase); 84 mach_timebase_info(&timebase);
85 timebase_ratio = (double)timebase.numer / (double)timebase.denom 85 timebase_ratio = (double)timebase.numer / (double)timebase.denom
86 * (double)1e-9; 86 * (double)1e-9;
87 87
88 relative_time = (double)(mach_absolute_time() * timebase_ratio); 88 relative_time = (double)(mach_absolute_time() * timebase_ratio);
89 } 89 }
90 90
91 #if 0 91 #if 0
92 #include <stdio.h> 92 #include <stdio.h>
93 93
94 int main(void) { 94 int main(void) {
95 int i,j, r, c = 200; 95 int i,j, r, c = 200;
96 long long t = 0; 96 long long t = 0;
97 97
98 InitTimer(); 98 InitTimer();
99 99
100 for (i = 0; i < c; i++) { 100 for (i = 0; i < c; i++) {
101 const int delay = rand() / (RAND_MAX / 1e5); 101 const int delay = rand() / (RAND_MAX / 1e5);
102 j = GetTimer(); 102 j = GetTimer();