Changeset 1509

Timestamp:

Oct 20, 2007 11:58:23 PM (17 years ago)

Author:

bennylp

Message:

Fixed bug in pjmedia clock_thread.c: busy loop when clock thread is stopped

File:

• pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c

@@ -28 +28 @@
  * Implementation of media clock with OS thread.
  */
-#define MAX_JUMP    500
 
 struct pjmedia_clock
@@ -38 +37 @@
     unsigned                 samples_per_frame;
     unsigned                 options;
+    pj_uint64_t              max_jump;
     pjmedia_clock_callback  *cb;
     void                    *user_data;
@@ -49 +49 @@
 static int clock_thread(void *arg);
 
+#define MAX_JUMP_MSEC   500
 
 /*
@@ -77 +78 @@
     clock->next_tick.u64 = 0;
     clock->timestamp.u64 = 0;
+    clock->max_jump = MAX_JUMP_MSEC * clock->freq.u64 / 1000;
     clock->samples_per_frame = samples_per_frame;
     clock->options = options;
@@ -143 +145 @@
 
 
+/* Calculate next tick */
+PJ_INLINE(void) clock_calc_next_tick(pjmedia_clock *clock,
+                                     pj_timestamp *now)
+{
+    if (clock->next_tick.u64+clock->max_jump < now->u64) {
+        /* Timestamp has made large jump, adjust next_tick */
+        clock->next_tick.u64 = now->u64;
+    }
+    clock->next_tick.u64 += clock->interval.u64;
+
+}
+
 /*
  * Poll the clock. 
@@ -185 +199 @@
 
     /* Calculate next tick */
-    if (clock->next_tick.u64+MAX_JUMP < now.u64) {
-        /* Timestamp has made large jump, adjust next_tick */
-        clock->next_tick.u64 = now.u64;
-    }
-    clock->next_tick.u64 += clock->interval.u64;
+    clock_calc_next_tick(clock, &now);
 
     /* Done */
@@ -221 +231 @@
 
         /* Skip if not running */
-        if (!clock->running)
+        if (!clock->running) {
+            /* Calculate next tick */
+            clock_calc_next_tick(clock, &now);
             continue;
+        }
 
         pj_lock_acquire(clock->lock);
@@ -234 +247 @@
 
         /* Calculate next tick */
-        if (clock->next_tick.u64+MAX_JUMP < now.u64) {
-            /* Timestamp has made large jump, adjust next_tick */
-            clock->next_tick.u64 = now.u64;
-        }
-        clock->next_tick.u64 += clock->interval.u64;
+        clock_calc_next_tick(clock, &now);
 
         pj_lock_release(clock->lock);