Changeset 3841 for pjproject/trunk/pjmedia/src/pjmedia-codec/ipp_codecs.c

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia-codec/ipp_codecs.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/ipp_codecs.c

@@ -42 +42 @@
 
 #define THIS_FILE   "ipp_codecs.c"
+
 
 /* Prototypes for IPP codecs factory */
@@ -239 +240 @@
 {
 #   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}}} }
@@ -489 +489 @@
         /* 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;
@@ -535 +533 @@
         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;
@@ -1420 +1419 @@
             /* 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
@@ -1443 +1443 @@
                 if (out.frametype == 6 || out.frametype == 7)
                     *info |= 0x80;
+                /* STI */
+                if (out.frametype != 1)
+                    *info |= 0x20;
             } else {
                 /* Untransmited */