Changeset 2677 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp

Timestamp:

May 6, 2009 3:44:12 PM (15 years ago)

Author:

nanang

Message:

Ticket #819:

• Updated APS to supports for sampling rate 16kHz and stereo (using resample).
• Fixed buffer len calculations in Symbian MDA.
• Disabled multichannel support on Symbian MDA (since its input device doesn't support for stereo?).

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp

@@ -271 +271 @@
       lastError_(KErrNone), timeStamp_(0),
       frameLen_(parent_strm->param.samples_per_frame * 
-                parent_strm->param.channel_count * 
                 BYTES_PER_SAMPLE),
       frameRecBuf_(NULL), frameRecBufLen_(0)
@@ -426 +425 @@
     }
 
-    if (frameRecBufLen_ || aBuffer.Size() < frameLen_) {
-        pj_memcpy(frameRecBuf_ + frameRecBufLen_, (void*) aBuffer.Ptr(), aBuffer.Size());
-        frameRecBufLen_ += aBuffer.Size();
+    if (frameRecBufLen_ || aBuffer.Length() < frameLen_) {
+        pj_memcpy(frameRecBuf_ + frameRecBufLen_, (void*) aBuffer.Ptr(), aBuffer.Length());
+        frameRecBufLen_ += aBuffer.Length();
     }
 
@@ -454 +453 @@
         f.type = PJMEDIA_FRAME_TYPE_AUDIO;
         f.buf = (void*)aBuffer.Ptr();
-        f.size = aBuffer.Size();
+        f.size = aBuffer.Length();
         f.timestamp.u32.lo = timeStamp_;
         f.bit_info = 0;
@@ -572 +571 @@
 {
     frameBufSize_ = parentStrm_->param.samples_per_frame *
-                    parentStrm_->param.channel_count * 
                     BYTES_PER_SAMPLE;
     frameBuf_ = new TUint8[frameBufSize_];
@@ -898 +896 @@
                      param->ext_fmt.id == PJMEDIA_FORMAT_L16,
                      PJ_ENOTSUP);
+    
+    /* It seems that MDA recorder only supports for mono channel. */
+    PJ_ASSERT_RETURN(param->channel_count == 1, PJ_EINVAL);
 
     /* Create and Initialize stream descriptor */