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

Timestamp:

Mar 19, 2006 12:48:43 AM (18 years ago)

Author:

bennylp

Message:

Tested and fixed stereo audio support

File:

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

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

@@ -86 +86 @@
 
     status = (*stream->rec_cb)(stream->user_data, stream->timestamp, 
-                               input, frameCount * stream->bytes_per_sample);
+                               input, frameCount * stream->bytes_per_sample *
+                               stream->channel_count);
     
     if (status==0) 
@@ -105 +106 @@
     pjmedia_snd_stream *stream = userData;
     pj_status_t status;
-    unsigned size = frameCount * stream->bytes_per_sample;
+    unsigned size = frameCount * stream->bytes_per_sample *
+                    stream->channel_count;
 
     PJ_UNUSED_ARG(input);
@@ -207 +209 @@
     int sampleFormat;
     const PaDeviceInfo *paDevInfo = NULL;
+    unsigned paFrames;
     PaError err;
 
@@ -218 +221 @@
         if (index == count) {
             /* No such device. */
-            return PJ_ENOTFOUND;
+            return PJMEDIA_ENOSNDREC;
         }
     } else {
@@ -224 +227 @@
         if (!paDevInfo) {
             /* Assumed it is "No such device" error. */
-            return PJ_ENOTFOUND;
+            return PJMEDIA_ESNDINDEVID;
         }
     }
@@ -235 +238 @@
         sampleFormat = paInt32;
     else
-        return PJ_ENOTSUP;
+        return PJMEDIA_ESNDINSAMPLEFMT;
     
     pool = pj_pool_create( snd_mgr.factory, "sndstream", 1024, 1024, NULL);
@@ -258 +261 @@
     inputParam.suggestedLatency = paDevInfo->defaultLowInputLatency;
 
+    /* Frames in PortAudio is number of samples in a single channel */
+    paFrames = samples_per_frame / channel_count;
+
     err = Pa_OpenStream( &stream->stream, &inputParam, NULL,
-                         clock_rate, samples_per_frame, 
-                         0, &PaRecorderCallback, stream );
+                         clock_rate, paFrames, 
+                         paClipOff, &PaRecorderCallback, stream );
     if (err != paNoError) {
         pj_pool_release(pool);
@@ -292 +298 @@
     int sampleFormat;
     const PaDeviceInfo *paDevInfo = NULL;
+    unsigned paFrames;
     PaError err;
 
@@ -303 +310 @@
         if (index == count) {
             /* No such device. */
-            return PJ_ENOTFOUND;
+            return PJMEDIA_ENOSNDPLAY;
         }
     } else {
@@ -309 +316 @@
         if (!paDevInfo) {
             /* Assumed it is "No such device" error. */
-            return PJ_ENOTFOUND;
+            return PJMEDIA_ESNDINDEVID;
         }
     }
@@ -320 +327 @@
         sampleFormat = paInt32;
     else
-        return PJ_ENOTSUP;
+        return PJMEDIA_ESNDINSAMPLEFMT;
     
     pool = pj_pool_create( snd_mgr.factory, "sndstream", 1024, 1024, NULL);
@@ -343 +350 @@
     outputParam.suggestedLatency = paDevInfo->defaultLowInputLatency;
 
+    /* Frames in PortAudio is number of samples in a single channel */
+    paFrames = samples_per_frame / channel_count;
+
     err = Pa_OpenStream( &stream->stream, NULL, &outputParam,
-                         clock_rate,  samples_per_frame, 
-                         0, &PaPlayerCallback, stream );
+                         clock_rate,  paFrames, 
+                         paClipOff, &PaPlayerCallback, stream );
     if (err != paNoError) {
         pj_pool_release(pool);
@@ -353 +363 @@
     PJ_LOG(5,(THIS_FILE, "%s opening device %s for playing, sample rate=%d, "
                          "channel count=%d, "
-                         "%d bits per sample, %d samples per buffer",
+                         "%d bits per sample, %d samples per frame",
                          (err==0 ? "Success" : "Error"),
                          paDevInfo->name, clock_rate, channel_count,