Changeset 3589

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.

Location:

pjproject/branches/1.x/pjmedia

Files:

• include/pjmedia-codec/amr_helper.h (modified) (6 diffs)
• src/pjmedia-codec/ipp_codecs.c (modified) (6 diffs)
• src/pjmedia-codec/passthrough.c (modified) (1 diff)

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) {

pjproject/branches/1.x/pjmedia/src/pjmedia-codec/ipp_codecs.c

@@ -42 +42 @@
 
 #define THIS_FILE   "ipp_codecs.c"
+
 
 /* Prototypes for IPP codecs factory */
@@ -238 +239 @@
 {
 #   if PJMEDIA_HAS_INTEL_IPP_CODEC_AMR
-    /* AMR-NB SID seems to produce noise, so let's just disable its VAD. */
     {1, "AMR",      PJMEDIA_RTP_PT_AMR,       &USC_GSMAMR_Fxns,  8000, 1, 160, 
-                    7400, 12200, 2, 0, 1, 
+                    7400, 12200, 2, 1, 1, 
                     &predecode_amr, &parse_amr, &pack_amr,
                     {1, {{{"octet-align", 11}, {"1", 1}}} }
@@ -488 +488 @@
         /* SID */
         if (info->good_quality) {
-            pj_bool_t STI;
-            STI = (((pj_uint8_t*)frame.buf)[35 >> 3] & 0x10) != 0;
-            usc_frame->frametype = STI? 2 : 1;
+            usc_frame->frametype = info->STI? 2 : 1;
         } else {
             usc_frame->frametype = setting->amr_nb ? 6 : 7;
@@ -534 +532 @@
         info->good_quality = (pj_uint8_t)((info_ & 0x80) == 0);
         info->mode = (pj_int8_t) ((info_ >> 8) & 0x0F);
+        info->STI = (pj_uint8_t)((info_ >> 5) & 1);
 
         frames[nframes].buf = r + 2;
@@ -1419 +1418 @@
             /* Two octets for AMR frame info, 0=LSB:
              * bit 0-3  : frame type
+             * bit 5    : STI flag
              * bit 6    : last frame flag
              * bit 7    : quality flag
@@ -1442 +1442 @@
                 if (out.frametype == 6 || out.frametype == 7)
                     *info |= 0x80;
+                /* STI */
+                if (out.frametype != 1)
+                    *info |= 0x20;
             } else {
                 /* Untransmited */

pjproject/branches/1.x/pjmedia/src/pjmedia-codec/passthrough.c

@@ -267 +267 @@
         info->good_quality = 1;
         info->mode = setting->enc_mode;
+        if (info->frame_type == SID_FT)
+            info->STI = (sf->data[4] >> 4) & 1;
 
         frames[i].buf = sf->data;