Changeset 2449

Timestamp:

Feb 10, 2009 1:02:11 PM (16 years ago)

Author:

nanang

Message:

Fixed the way of stacking PCMU/A frames for APS player callback.

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/symbian_sound_aps.cpp (modified) (3 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/symbian_sound_aps.cpp

@@ -983 +983 @@
                 samples_req = 80;
             
+            buf.iBuffer.Append(1);
+            buf.iBuffer.Append(0);
+            
             /* Call parent stream callback to get samples to play. */
             while (samples_ready < samples_req) {
@@ -1000 +1003 @@
                     samples_cnt = frame->samples_cnt / frame->subframe_cnt;
                     if (sf->data && sf->bitlen) {
-                        buf.iBuffer.Append(1);
-                        buf.iBuffer.Append(0);
                         buf.iBuffer.Append((TUint8*)sf->data, sf->bitlen>>3);
                     } else {
-                        buf.iBuffer.Append(0);
-                        buf.iBuffer.Append(0);
+                        pj_uint8_t silc;
+                        silc = (strm->setting.format.u32==PJMEDIA_FOURCC_PCMU)?
+                                pjmedia_linear2ulaw(0) : pjmedia_linear2alaw(0);
+                        buf.iBuffer.AppendFill(silc, samples_cnt);
                     }
                     samples_ready += samples_cnt;
@@ -1012 +1015 @@
                 
                 } else { /* PJMEDIA_FRAME_TYPE_NONE */
-                    buf.iBuffer.Append(0);
-                    buf.iBuffer.Append(0);
+                    pj_uint8_t silc;
+                    
+                    silc = (strm->setting.format.u32==PJMEDIA_FOURCC_PCMU)?
+                            pjmedia_linear2ulaw(0) : pjmedia_linear2alaw(0);
+                    buf.iBuffer.AppendFill(silc, samples_req - samples_ready);
 
                     samples_ready = samples_req;