Changeset 3410 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c

Timestamp:

Jan 31, 2011 11:27:48 AM (13 years ago)

Author:

ming

Message:

Re #1192: Fixes stereo support.

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c (modified) (4 diffs)

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

@@ -661 +661 @@
 
     ioData->mNumberBuffers = 1;
-    ioData->mBuffers[0].mNumberChannels = 1;
+    ioData->mBuffers[0].mNumberChannels = strm->streamFormat.mChannelsPerFrame;
     ioData->mBuffers[0].mData = strm->resample_buf_ptr;
     ioData->mBuffers[0].mDataByteSize = *ioNumberDataPackets *
+                                        strm->streamFormat.mChannelsPerFrame *
                                         strm->param.bits_per_sample >> 3;
 
@@ -726 +727 @@
     if (nsamples >= resampleSize) {
         pjmedia_frame frame;
-        UInt32 resampleOutput = strm->param.samples_per_frame;
+        UInt32 resampleOutput = strm->param.samples_per_frame /
+                                strm->streamFormat.mChannelsPerFrame;
         AudioBufferList ab;
 
@@ -736 +738 @@
         
         ab.mNumberBuffers = 1;
-        ab.mBuffers[0].mNumberChannels = 1;
+        ab.mBuffers[0].mNumberChannels = strm->streamFormat.mChannelsPerFrame;
         ab.mBuffers[0].mData = strm->rec_buf;
         ab.mBuffers[0].mDataByteSize = frame.size;
@@ -779 +781 @@
             strm->resample_buf_ptr = input;
             ab.mBuffers[0].mDataByteSize = frame.size;
-            resampleOutput = strm->param.samples_per_frame;
+            resampleOutput = strm->param.samples_per_frame /
+                             strm->streamFormat.mChannelsPerFrame;
             ostatus = AudioConverterFillComplexBuffer(strm->resample,
                                                       resampleProc,