Changeset 358 for pjproject/trunk/pjmedia/src/pjmedia/pasound.c

Timestamp:

Mar 24, 2006 8:41:20 PM (18 years ago)

Author:

bennylp

Message:

Added WAVE writer and resample port, and also found out why audio quality is poor with DirectSound?

File:

• pjproject/trunk/pjmedia/src/pjmedia/pasound.c (modified) (11 diffs)

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -132 +132 @@
     }
 
-    if (statusFlags & paInputUnderflow)
+    if (statusFlags & paOutputUnderflow)
         ++stream->underflow;
-    if (statusFlags & paInputOverflow)
+    if (statusFlags & paOutputOverflow)
         ++stream->overflow;
 
@@ -240 +240 @@
     int sampleFormat;
     const PaDeviceInfo *paDevInfo = NULL;
+    const PaHostApiInfo *paHostApiInfo = NULL;
     unsigned paFrames;
     PaError err;
@@ -292 +293 @@
     inputParam.suggestedLatency = paDevInfo->defaultLowInputLatency;
 
+    paHostApiInfo = Pa_GetHostApiInfo(paDevInfo->hostApi);
+
     /* Frames in PortAudio is number of samples in a single channel */
     paFrames = samples_per_frame / channel_count;
@@ -303 +306 @@
     }
 
-    PJ_LOG(5,(THIS_FILE, "%s opening device %s for recording, sample rate=%d, "
-                         "channel count=%d, "
-                         "%d bits per sample, %d samples per buffer",
+    PJ_LOG(5,(THIS_FILE, "%s opening device %s (%s) for recording, sample "
+                         "rate=%d, ch=%d, "
+                         "bits=%d, %d samples per frame",
                          (err==0 ? "Success" : "Error"),
-                         paDevInfo->name, clock_rate, channel_count,
+                         paDevInfo->name, paHostApiInfo->name,
+                         clock_rate, channel_count,
                          bits_per_sample, samples_per_frame));
 
@@ -329 +333 @@
     int sampleFormat;
     const PaDeviceInfo *paDevInfo = NULL;
+    const PaHostApiInfo *paHostApiInfo = NULL;
     unsigned paFrames;
     PaError err;
@@ -381 +386 @@
     outputParam.suggestedLatency = paDevInfo->defaultLowInputLatency;
 
+    paHostApiInfo = Pa_GetHostApiInfo(paDevInfo->hostApi);
+
     /* Frames in PortAudio is number of samples in a single channel */
     paFrames = samples_per_frame / channel_count;
@@ -392 +399 @@
     }
 
-    PJ_LOG(5,(THIS_FILE, "%s opening device %s for playing, sample rate=%d, "
-                         "channel count=%d, "
-                         "%d bits per sample, %d samples per frame",
+    PJ_LOG(5,(THIS_FILE, "%s opening device %s(%s) for playing, sample rate=%d"
+                         ", ch=%d, "
+                         "bits=%d, %d samples per frame",
                          (err==0 ? "Success" : "Error"),
-                         paDevInfo->name, clock_rate, channel_count,
+                         paDevInfo->name, paHostApiInfo->name, 
+                         clock_rate, channel_count,
                          bits_per_sample, samples_per_frame));
 
@@ -426 +434 @@
     const PaDeviceInfo *paRecDevInfo = NULL;
     const PaDeviceInfo *paPlayDevInfo = NULL;
+    const PaHostApiInfo *paRecHostApiInfo = NULL;
+    const PaHostApiInfo *paPlayHostApiInfo = NULL;
     unsigned paFrames;
     PaError err;
@@ -498 +508 @@
     inputParam.suggestedLatency = paRecDevInfo->defaultLowInputLatency;
 
+    paRecHostApiInfo = Pa_GetHostApiInfo(paRecDevInfo->hostApi);
+
     pj_memset(&outputParam, 0, sizeof(outputParam));
     outputParam.device = play_id;
@@ -503 +515 @@
     outputParam.hostApiSpecificStreamInfo = NULL;
     outputParam.sampleFormat = sampleFormat;
-    outputParam.suggestedLatency = paPlayDevInfo->defaultLowInputLatency;
+    outputParam.suggestedLatency = paPlayDevInfo->defaultLowOutputLatency;
+
+    paPlayHostApiInfo = Pa_GetHostApiInfo(paPlayDevInfo->hostApi);
 
     /* Frames in PortAudio is number of samples in a single channel */
@@ -516 +530 @@
     }
 
-    PJ_LOG(5,(THIS_FILE, "%s opening device %s/%s for recording and playback, "
-                         "sample rate=%d, channel count=%d, "
-                         "%d bits per sample, %d samples per buffer",
+    PJ_LOG(5,(THIS_FILE, "%s opening device %s(%s)/%s(%s) for recording and "
+                         "playback, sample rate=%d, ch=%d, "
+                         "bits=%d, %d samples per frame",
                          (err==0 ? "Success" : "Error"),
-                         paRecDevInfo->name, paPlayDevInfo->name,
+                         paRecDevInfo->name, paRecHostApiInfo->name,
+                         paPlayDevInfo->name, paPlayHostApiInfo->name,
                          clock_rate, channel_count,
                          bits_per_sample, samples_per_frame));