Changeset 2550

Timestamp:

Mar 23, 2009 1:32:39 PM (16 years ago)

Author:

nanang

Message:

Ticket #754: back-porting ticket #753

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/clock_thread.c (modified) (4 diffs)

pjproject/branches/1.0/pjmedia/src/pjmedia/clock_thread.c

@@ -36 +36 @@
     pj_timestamp             next_tick;
     pj_timestamp             timestamp;
-    unsigned                 samples_per_frame;
+    unsigned                 timestamp_inc;
     unsigned                 options;
     pj_uint64_t              max_jump;
@@ -82 +82 @@
     clock->timestamp.u64 = 0;
     clock->max_jump = MAX_JUMP_MSEC * clock->freq.u64 / 1000;
-    clock->samples_per_frame = samples_per_frame;
+    clock->timestamp_inc = samples_per_frame / channel_count;
     clock->options = options;
     clock->cb = cb;
@@ -201 +201 @@
 
     /* Increment timestamp */
-    clock->timestamp.u64 += clock->samples_per_frame;
+    clock->timestamp.u64 += clock->timestamp_inc;
 
     /* Calculate next tick */
@@ -256 +256 @@
 
         /* Increment timestamp */
-        clock->timestamp.u64 += clock->samples_per_frame;
+        clock->timestamp.u64 += clock->timestamp_inc;
 
         /* Calculate next tick */