Changeset 2495

Timestamp:

Mar 10, 2009 12:05:23 PM (16 years ago)

Author:

bennylp

Message:

Attempt to reduce burst in wmme_dev by limiting the number of AddBuffer? calls. It does not seem to affect the burst much as it seem to have come from the device/driver itself

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/wmme_dev.c (modified) (7 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/wmme_dev.c

@@ -674 +674 @@
     pj_status_t status = PJ_SUCCESS;
     static unsigned rec_cnt, play_cnt;
+    enum { MAX_BURST = 1 };
 
     rec_cnt = play_cnt = 0;
@@ -707 +708 @@
         pjmedia_dir signalled_dir;
 
-        /* Swap */
+        /* Swap hWaveIn and hWaveOut to get equal opportunity for both */
         if (eventCount==3) {
             HANDLE hTemp = events[2];
@@ -740 +741 @@
         {
             struct wmme_channel *wmme_strm = &strm->play_strm;
+            unsigned burst;
 
             status = PJ_SUCCESS;
@@ -748 +750 @@
              */
 
-            while (wmme_strm->WaveHdr[wmme_strm->dwBufIdx].dwFlags & WHDR_DONE)
+            for (burst=0; burst<MAX_BURST &&
+                 (wmme_strm->WaveHdr[wmme_strm->dwBufIdx].dwFlags & WHDR_DONE);
+                 ++burst)
             {
                 void *buffer = wmme_strm->WaveHdr[wmme_strm->dwBufIdx].lpData;
@@ -829 +833 @@
                 wmme_strm->timestamp.u64 += strm->param.samples_per_frame /
                                             strm->param.channel_count;
-            }
+            } /* for */
         }
         else
         {
             struct wmme_channel *wmme_strm = &strm->rec_strm;
+            unsigned burst;
             MMRESULT mr = MMSYSERR_NOERROR;
             status = PJ_SUCCESS;
@@ -865 +870 @@
 #endif
 
-            while (wmme_strm->WaveHdr[wmme_strm->dwBufIdx].dwFlags & WHDR_DONE)
+            for (burst=0; burst<MAX_BURST &&
+                 (wmme_strm->WaveHdr[wmme_strm->dwBufIdx].dwFlags & WHDR_DONE);
+                 ++burst)
             {
                 char* buffer = (char*)
@@ -935 +942 @@
                 wmme_strm->timestamp.u64 += strm->param.samples_per_frame /
                                             strm->param.channel_count;
-            }
+            } /* for */
         }
     }