Changeset 648 for pjproject/trunk/pjmedia/src/pjmedia/dsound.c

Timestamp:

Aug 4, 2006 6:27:19 PM (18 years ago)

Author:

bennylp

Message:

More work on the AEC (including changes in PJSUA), embed the AEC in sound_port, reduce DirectSound? buffer from 32 to 16, and fixed ARM compilation for MSVC WinCE target.

File:

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

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

@@ -453 +453 @@
     unsigned eventCount;
     unsigned bytes_per_frame;
-    int excess_rec = 0;
     pj_status_t status;
 
@@ -503 +502 @@
             
             struct dsound_stream *dsound_strm;
-            int i;
 
             /*
@@ -513 +511 @@
             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, 
+            /* Get frame from application. */
+            status = (*strm->play_cb)(strm->user_data, 
+                                      dsound_strm->timestamp.u32.lo,
+                                      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 {
@@ -545 +538 @@
              */
             struct dsound_stream *dsound_strm;
-            int captured = 0;
             BOOL rc;
 
@@ -559 +551 @@
                 if (!rc) {
                     pj_bzero(strm->buffer, bytes_per_frame);
-                } else {
-                    captured++;
-                }
+                } 
 
                 /* Call callback */
@@ -583 +573 @@
             } while (dsound_captured_size(dsound_strm) > bytes_per_frame);
 
-            excess_rec = captured-1;
-            if (excess_rec < 0) excess_rec = 0;
         }
     }