Changeset 3589 for pjproject/branches/1.x/pjmedia/include/pjmedia-codec/amr_helper.h

Timestamp:

Jun 20, 2011 4:06:19 AM (13 years ago)

Author:

nanang

Message:

Fixed #1307:

• Fixed AMR NO_DATA frame length definition in amr_helper.h.
• Fixed bug packing/parsing AMR SID frames in processing SID type indicator (STI).
• Enabled native VAD in IPP AMR-NB.

File:

• pjproject/branches/1.x/pjmedia/include/pjmedia-codec/amr_helper.h (modified) (6 diffs)

pjproject/branches/1.x/pjmedia/include/pjmedia-codec/amr_helper.h

@@ -568 +568 @@
  */
 const pj_uint8_t  pjmedia_codec_amrnb_framelen[16] = 
-    {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 5};
+    {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
 /**
  * Constant of AMR-NB frame lengths in bits.
@@ -584 +584 @@
  */
 const pj_uint8_t  pjmedia_codec_amrwb_framelen[16] = 
-    {17, 23, 32, 37, 40, 46, 50, 58, 60, 5, 0, 0, 0, 0, 0, 5};
+    {17, 23, 32, 37, 40, 46, 50, 58, 60, 5, 0, 0, 0, 0, 0, 0};
 /**
  * Constant of AMR-WB frame lengths in bits.
@@ -607 +607 @@
     pj_uint8_t start_bit;       /**< Frame start bit.                   */
     pj_uint8_t good_quality:1;  /**< Flag if frame is good/degraded.    */
+    pj_uint8_t STI:1;           /**< STI mode (first/update).           */
 } pjmedia_codec_amr_bit_info;
 #pragma pack()
@@ -1021 +1022 @@
 
             /* SID */
-            pj_uint8_t STI = 0;
-
-            amr_bits[35] = (pj_uint8_t)(STI & 1);
+            amr_bits[35] |= info->STI;
 
             if (setting->amr_nb) {
@@ -1164 +1163 @@
         info->good_quality = (pj_uint8_t)(Q == 1);
         info->start_bit = 0;
+        info->STI = 0;
         frames[cnt].timestamp = ts_;
         frames[cnt].type = PJMEDIA_FRAME_TYPE_AUDIO;
@@ -1186 +1186 @@
         frames[cnt].buf = r;
         info->start_bit = r_bitptr;
+
+        if (FT == SID_FT) {
+            unsigned sti_bitptr;
+            sti_bitptr = r_bitptr + 35;
+            info->STI = (pj_uint8_t)
+                        (r[sti_bitptr >> 3] >> (7 - (sti_bitptr % 8))) & 1;
+        }
 
         if (setting->octet_aligned) {