Changeset 1662

Timestamp:

Jan 4, 2008 5:57:51 PM (16 years ago)

Author:

bennylp

Message:

Fixed timestamp bug in pasound.c: timestamp is shared by both playback and record and it was incorrectly incremented by both

File:

• pjproject/trunk/pjmedia/src/pjmedia/pasound.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -62 +62 @@
     pjmedia_snd_play_cb  play_cb;
 
-    pj_uint32_t          timestamp;
+    pj_uint32_t          play_timestamp;
+    pj_uint32_t          rec_timestamp;
     pj_uint32_t          underflow;
     pj_uint32_t          overflow;
@@ -90 +91 @@
     pj_status_t status;
 
+    pj_assert(frameCount == stream->samples_per_frame * stream->channel_count);
+
     PJ_UNUSED_ARG(output);
     PJ_UNUSED_ARG(timeInfo);
@@ -111 +114 @@
         ++stream->overflow;
 
-    stream->timestamp += frameCount;
-
-    status = (*stream->rec_cb)(stream->user_data, stream->timestamp, 
+    stream->rec_timestamp += frameCount;
+
+    status = (*stream->rec_cb)(stream->user_data, stream->rec_timestamp, 
                                (void*)input, 
                                frameCount * stream->bytes_per_sample *
@@ -138 +141 @@
                     stream->channel_count;
 
+    pj_assert(frameCount == stream->samples_per_frame * stream->channel_count);
+
     PJ_UNUSED_ARG(input);
     PJ_UNUSED_ARG(timeInfo);
@@ -159 +164 @@
         ++stream->overflow;
 
-    stream->timestamp += frameCount;
-
-    status = (*stream->play_cb)(stream->user_data, stream->timestamp, 
+    stream->play_timestamp += frameCount;
+
+    status = (*stream->play_cb)(stream->user_data, stream->play_timestamp, 
                                 output, size);