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

Timestamp:

Feb 10, 2009 4:43:16 AM (15 years ago)

Author:

nanang

Message:

• Fixed conf switch on reinit-ing conf port TX buf.
• Updated conf switch to enable RX/TX level adjustment.
• Added VAD & PLC setting in passthrough codecs.
• Changed G711 fourcc codes.
• Updated bits-to-bytes calculations all over the places.
• Minor update: changed log level for dumping jbuf states in stream.

File:

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

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

@@ -779 +779 @@
         break;
         
-    case PJMEDIA_FOURCC_G711U:
-    case PJMEDIA_FOURCC_G711A:
+    case PJMEDIA_FOURCC_PCMU:
+    case PJMEDIA_FOURCC_PCMA:
         {
             unsigned samples_processed = 0;
@@ -858 +858 @@
                      * 0xxxxy00, where xxxx:frame type, y:not sure. 
                      */
-                    unsigned len = sf->bitlen>>3;
+                    unsigned len = (sf->bitlen+7)>>3;
                     enum {SID_FT = 8 };
                     pj_uint8_t amr_header = 4, ft = SID_FT;
-
-                    if (sf->bitlen & 0x07)
-                        ++len;
 
                     if (len >= pjmedia_codec_amrnb_framelen[0])
@@ -976 +973 @@
         break;
         
-    case PJMEDIA_FOURCC_G711U:
-    case PJMEDIA_FOURCC_G711A:
+    case PJMEDIA_FOURCC_PCMU:
+    case PJMEDIA_FOURCC_PCMA:
         {
             unsigned samples_ready = 0;
@@ -1105 +1102 @@
         strm->setting.format.u32 = PJMEDIA_FOURCC_L16;
 
-    /* Set audio engine settings. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_G711U ||
+    /* Set audio engine fourcc. */
+    if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
+        strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
         strm->setting.format.u32 == PJMEDIA_FOURCC_L16)
     {
@@ -1114 +1112 @@
     }
 
+    /* Set audio engine mode. */
     if (strm->setting.format.u32 == PJMEDIA_FOURCC_AMR)
     {
         aps_setting.mode = (TAPSCodecMode)strm->setting.bitrate;
-    } else if (strm->setting.format.u32 == PJMEDIA_FOURCC_G711U ||
-               strm->setting.format.u32 == PJMEDIA_FOURCC_L16   ||
-              (strm->setting.format.u32 == PJMEDIA_FOURCC_ILBC  &&
-               strm->setting.mode == 30))
+    } 
+    else if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
+             strm->setting.format.u32 == PJMEDIA_FOURCC_L16   ||
+            (strm->setting.format.u32 == PJMEDIA_FOURCC_ILBC  &&
+             strm->setting.mode == 30))
     {
         aps_setting.mode = EULawOr30ms;
-    } else {
+    } 
+    else if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
+            (strm->setting.format.u32 == PJMEDIA_FOURCC_ILBC &&
+             strm->setting.mode == 20))
+    {
         aps_setting.mode = EALawOr20ms;
     }
 
     /* Disable VAD on L16 and G711. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_L16 ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_G711U ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_G711A)
+    if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
+        strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
+        strm->setting.format.u32 == PJMEDIA_FOURCC_L16)
     {
         aps_setting.vad = EFalse;
@@ -1137 +1141 @@
     }
     
+    /* Set other audio engine attributes. */
     aps_setting.plc = strm->setting.plc;
     aps_setting.cng = strm->setting.cng;
     aps_setting.loudspk = strm->setting.loudspk;
 
+    /* Set audio engine callbacks. */
     if (strm->setting.format.u32 == PJMEDIA_FOURCC_L16) {
         aps_play_cb = &PlayCbPcm;
@@ -1149 +1155 @@
     }
 
-    // Create the audio engine.
+    /* Create the audio engine. */
     TRAPD(err, strm->engine = CPjAudioEngine::NewL(strm,
                                                    aps_rec_cb, aps_play_cb,