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.



git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3589 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 22 insertions, 10 deletions

diff --git a/pjmedia/include/pjmedia-codec/amr_helper.h b/pjmedia/include/pjmedia-codec/amr_helper.h
index 6bca5ac1..fc63eb47 100644
--- a/pjmedia/include/pjmedia-codec/amr_helper.h
+++ b/pjmedia/include/pjmedia-codec/amr_helper.h
@@ -567,7 +567,7 @@ const pj_int16_t* const pjmedia_codec_amrwb_ordermaps[9] =
  * Constant of AMR-NB frame lengths in bytes.
  */
 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.
  */
@@ -583,7 +583,7 @@ const pj_uint16_t pjmedia_codec_amrnb_bitrates[8] =
  * Constant of AMR-WB frame lengths in bytes.
  */
 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.
  */
@@ -606,6 +606,7 @@ typedef struct pjmedia_codec_amr_bit_info {
     pj_int8_t  mode;		/**< AMR mode.				*/
     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()
 
@@ -1020,9 +1021,7 @@ PJ_INLINE (pj_status_t) pjmedia_codec_amr_pack(
 	} else if (info->frame_type == SID_FT) {
 
 	    /* SID */
-	    pj_uint8_t STI = 0;
-
-	    amr_bits[35] = (pj_uint8_t)(STI & 1);
+	    amr_bits[35] |= info->STI;
 
 	    if (setting->amr_nb) {
 		amr_bits[36] = (pj_uint8_t)((info->mode >> 2) & 1);
@@ -1163,6 +1162,7 @@ PJ_INLINE(pj_status_t) pjmedia_codec_amr_parse(
 	info->mode = (pj_int8_t)((FT < SID_FT)? FT : -1);
 	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,6 +1186,13 @@ PJ_INLINE(pj_status_t) pjmedia_codec_amr_parse(
 	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) {
 	    r += framelen_tbl[FT];
 	    frames[cnt].size = framelen_tbl[FT];
diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c
index 023cdc7a..4d201136 100644
--- a/pjmedia/src/pjmedia-codec/ipp_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c
@@ -42,6 +42,7 @@
 
 #define THIS_FILE   "ipp_codecs.c"
 
+
 /* Prototypes for IPP codecs factory */
 static pj_status_t ipp_test_alloc( pjmedia_codec_factory *factory, 
 				   const pjmedia_codec_info *id );
@@ -237,9 +238,8 @@ static struct ipp_codec {
 ipp_codec[] = 
 {
 #   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}}} }
     },
@@ -487,9 +487,7 @@ static void predecode_amr( ipp_private_t *codec_data,
     } else if (frame.size == 5) {
 	/* 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;
 	}
@@ -533,6 +531,7 @@ static pj_status_t pack_amr(ipp_private_t *codec_data, void *pkt,
 	info->frame_type = (pj_uint8_t)(info_ & 0x0F);
 	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;
 	frames[nframes].size = info->frame_type <= SID_FT ?
@@ -1418,6 +1417,7 @@ static pj_status_t ipp_codec_encode( pjmedia_codec *codec,
 
 	    /* 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
 	     * bit 8-11	: mode
@@ -1441,6 +1441,9 @@ static pj_status_t ipp_codec_encode( pjmedia_codec *codec,
 		/* Quality */
 		if (out.frametype == 6 || out.frametype == 7)
 		    *info |= 0x80;
+		/* STI */
+		if (out.frametype != 1)
+		    *info |= 0x20;
 	    } else {
 		/* Untransmited */
 		*info = 15;
diff --git a/pjmedia/src/pjmedia-codec/passthrough.c b/pjmedia/src/pjmedia-codec/passthrough.c
index 73eed891..8eab2f7e 100644
--- a/pjmedia/src/pjmedia-codec/passthrough.c
+++ b/pjmedia/src/pjmedia-codec/passthrough.c
@@ -266,6 +266,8 @@ static pj_status_t pack_amr ( codec_private_t *codec_data,
 	}
 	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;
 	frames[i].size = len;