Changeset 2841

Timestamp:

Jul 18, 2009 9:21:09 AM (15 years ago)

Author:

bennylp

Message:

Misc (#915): added WAVE_FORMAT_DIRECT flag when opening waveIn/Out in WMME audio dev, hopefully it can reduce latency

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/wmme_dev.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/wmme_dev.c

@@ -516 +516 @@
     WAVEFORMATEX wfx; 
     unsigned i, ptime;
+    DWORD flag;
     pj_status_t status;
 
@@ -538 +539 @@
     parent->bytes_per_frame = wfx.nAvgBytesPerSec * ptime / 1000;
 
+    flag = CALLBACK_EVENT;
+    if (prm->ext_fmt.id == PJMEDIA_FORMAT_L16)
+        flag |= WAVE_FORMAT_DIRECT;
+
     /*
      * Open wave device.
@@ -543 +548 @@
     mr = waveOutOpen(&wmme_strm->hWave.Out, 
                      wf->dev_info[prm->play_id].deviceId,
-                     &wfx, (DWORD)wmme_strm->hEvent, 0, CALLBACK_EVENT);
+                     &wfx, (DWORD)wmme_strm->hEvent, 0, flag);
     if (mr != MMSYSERR_NOERROR) {
         return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
@@ -604 +609 @@
     MMRESULT mr;
     WAVEFORMATEX wfx; 
+    DWORD flag;
     unsigned i, ptime;
 
@@ -624 +630 @@
     parent->bytes_per_frame = wfx.nAvgBytesPerSec * ptime / 1000;
 
+    flag = CALLBACK_EVENT;
+    if (prm->ext_fmt.id == PJMEDIA_FORMAT_L16)
+        flag |= WAVE_FORMAT_DIRECT;
+
     /*
      * Open wave device.
@@ -629 +639 @@
     mr = waveInOpen(&wmme_strm->hWave.In, 
                     wf->dev_info[prm->rec_id].deviceId, 
-                    &wfx, (DWORD)wmme_strm->hEvent, 0, CALLBACK_EVENT);
+                    &wfx, (DWORD)wmme_strm->hEvent, 0, flag);
     if (mr != MMSYSERR_NOERROR) {
         return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr);