Changeset 644 for pjproject

Timestamp:

Aug 4, 2006 11:00:35 AM (18 years ago)

Author:

bennylp

Message:

Experimental change in PJMEDIA dsound.c DirectSound? backend: (1) Don't raise thread priority, and (2) when capturing multiple frames from the microphone, do the same in the playback direction.

File:

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

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

@@ -45 +45 @@
 
 #define MAX_PACKET_BUFFER_COUNT     32
-#define DEFAULT_BUFFER_COUNT        32
+#define DEFAULT_BUFFER_COUNT        16
 
 #define MAX_HARDWARE                16
@@ -453 +453 @@
     unsigned eventCount;
     unsigned bytes_per_frame;
+    int excess_rec = 0;
     pj_status_t status;
 
@@ -466 +467 @@
      * system activity.
      */
-    SetThreadPriority( GetCurrentThread(), THREAD_PRIORITY_HIGHEST);
+    //SetThreadPriority( GetCurrentThread(), THREAD_PRIORITY_HIGHEST);
 
     /* Calculate bytes per frame */
@@ -502 +503 @@
             
             struct dsound_stream *dsound_strm;
+            int i;
 
             /*
@@ -509 +511 @@
 
             dsound_strm = &strm->play_strm;
-
-            /* Get frame from application. */
-            status = (*strm->play_cb)(strm->user_data, 
-                                      dsound_strm->timestamp.u32.lo,
-                                      strm->buffer,
+            status = PJ_SUCCESS;
+
+            for (i=0; i <= excess_rec; ++i) {
+                /* Get frame from application. */
+                status = (*strm->play_cb)(strm->user_data, 
+                                          dsound_strm->timestamp.u32.lo,
+                                          strm->buffer,
+                                          bytes_per_frame);
+                if (status != PJ_SUCCESS)
+                    break;
+
+                /* Write to DirectSound buffer. */
+                AppWriteDataToBuffer( dsound_strm->ds.play.lpDsBuffer, 
+                                      dsound_strm->dwBytePos,
+                                      (LPBYTE)strm->buffer, 
                                       bytes_per_frame);
+
+                /* Increment position. */
+                dsound_strm->dwBytePos += bytes_per_frame;
+                if (dsound_strm->dwBytePos >= dsound_strm->dwDsBufferSize)
+                    dsound_strm->dwBytePos -= dsound_strm->dwDsBufferSize;
+                dsound_strm->timestamp.u64 += strm->samples_per_frame;
+            }
+
             if (status != PJ_SUCCESS)
                 break;
-
-            /* Write to DirectSound buffer. */
-            AppWriteDataToBuffer( dsound_strm->ds.play.lpDsBuffer, 
-                                  dsound_strm->dwBytePos,
-                                  (LPBYTE)strm->buffer, 
-                                  bytes_per_frame);
-
-            /* Increment position. */
-            dsound_strm->dwBytePos += bytes_per_frame;
-            if (dsound_strm->dwBytePos >= dsound_strm->dwDsBufferSize)
-                dsound_strm->dwBytePos -= dsound_strm->dwDsBufferSize;
-            dsound_strm->timestamp.u64 += strm->samples_per_frame;
 
         } else {
@@ -537 +545 @@
              */
             struct dsound_stream *dsound_strm;
+            int captured = 0;
             BOOL rc;
 
@@ -550 +559 @@
                 if (!rc) {
                     pj_bzero(strm->buffer, bytes_per_frame);
+                } else {
+                    captured++;
                 }
 
@@ -571 +582 @@
                 /* Fetch while we have more than 1 frame */
             } while (dsound_captured_size(dsound_strm) > bytes_per_frame);
+
+            excess_rec = captured-1;
+            if (excess_rec < 0) excess_rec = 0;
         }
     }