Changeset 2010

Timestamp:

Jun 12, 2008 4:54:48 PM (16 years ago)

Author:

nanang

Message:

More ticket #542: updated dsound.c to adapt with latency setting

File:

• pjproject/trunk/pjmedia/src/pjmedia/dsound.c (modified) (9 diffs)

pjproject/trunk/pjmedia/src/pjmedia/dsound.c

@@ -44 +44 @@
 #define BYTES_PER_SAMPLE    (BITS_PER_SAMPLE/8)
 
-#define MAX_PACKET_BUFFER_COUNT     PJMEDIA_SOUND_BUFFER_COUNT
-#define DEFAULT_BUFFER_COUNT        PJMEDIA_SOUND_BUFFER_COUNT
+#define MAX_PACKET_BUFFER_COUNT     50
+#define MIN_PACKET_BUFFER_COUNT     2
 
 #define MAX_HARDWARE                16
@@ -88 +88 @@
     DWORD                   dwDsBufferSize;
     pj_timestamp            timestamp;
+    unsigned                latency;
 };
 
@@ -239 +240 @@
     ds_strm->dwDsBufferSize = buffer_count * bytes_per_frame;
     ds_strm->timestamp.u64 = 0;
-
+    ds_strm->latency = buffer_count * samples_per_frame * 1000 / clock_rate / 
+                       channel_count;
 
     /* Done setting up play device. */
@@ -345 +347 @@
     ds_strm->timestamp.u64 = 0;
     ds_strm->dwDsBufferSize = buffer_count * bytes_per_frame;
+    ds_strm->latency = buffer_count * samples_per_frame * 1000 / clock_rate / 
+                       channel_count;
 
     /* Done setting up recorder device. */
@@ -727 +731 @@
     pjmedia_snd_stream *strm;
     pj_status_t status;
-
 
     /* Make sure sound subsystem has been initialized with
@@ -762 +765 @@
     /* Create player stream */
     if (dir & PJMEDIA_DIR_PLAYBACK) {
+        unsigned buffer_count;
+        
+        /* Calculate buffer count, in frame unit */
+        buffer_count = clock_rate * snd_output_latency / samples_per_frame /
+                       1000;
+        if (buffer_count < MIN_PACKET_BUFFER_COUNT)
+            buffer_count = MIN_PACKET_BUFFER_COUNT;
+        if (buffer_count > MAX_PACKET_BUFFER_COUNT)
+            buffer_count = MAX_PACKET_BUFFER_COUNT;
+
         status = init_player_stream( &strm->play_strm, play_id, clock_rate,
                                      channel_count, samples_per_frame,
-                                     DEFAULT_BUFFER_COUNT );
+                                     buffer_count );
         if (status != PJ_SUCCESS) {
             pjmedia_snd_stream_close(strm);
@@ -773 +786 @@
     /* Create capture stream */
     if (dir & PJMEDIA_DIR_CAPTURE) {
+        unsigned buffer_count;
+        
+        /* Calculate buffer count, in frame unit */
+        buffer_count = clock_rate * snd_input_latency / samples_per_frame /
+                       1000;
+        if (buffer_count < MIN_PACKET_BUFFER_COUNT)
+            buffer_count = MIN_PACKET_BUFFER_COUNT;
+        if (buffer_count > MAX_PACKET_BUFFER_COUNT)
+            buffer_count = MAX_PACKET_BUFFER_COUNT;
+
         status = init_capture_stream( &strm->rec_strm, rec_id, clock_rate,
                                       channel_count, samples_per_frame,
-                                      DEFAULT_BUFFER_COUNT);
+                                      buffer_count);
         if (status != PJ_SUCCESS) {
             pjmedia_snd_stream_close(strm);
@@ -872 +895 @@
     pi->samples_per_frame = strm->samples_per_frame;
     pi->bits_per_sample = strm->bits_per_sample;
-    pi->rec_latency = 0;
-    pi->play_latency = 0;
+    pi->rec_latency = strm->rec_strm.latency;
+    pi->play_latency = strm->play_strm.latency;
 
     return PJ_SUCCESS;
@@ -997 +1020 @@
                                             unsigned output_latency)
 {
-    PJ_TODO(APPLY_LATENCY_SETTINGS_ON_DSOUND);
-
     snd_input_latency  = (input_latency == 0)? 
                          PJMEDIA_SND_DEFAULT_REC_LATENCY : input_latency;