Changeset 2445 for pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/port.h

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/include/pjmedia/port.h (modified) (3 diffs)

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/port.h

@@ -301 +301 @@
 PJ_INLINE(void) pjmedia_frame_ext_append_subframe(pjmedia_frame_ext *frm,
                                                   const void *src,
-                                                  pj_uint16_t bitlen,
-                                                  pj_uint16_t samples_cnt)
-{
+                                                  unsigned bitlen,
+                                                  unsigned samples_cnt)
+{
+    pjmedia_frame_ext_subframe *fsub;
     pj_uint8_t *p;
-    unsigned i, tmp;
+    unsigned i;
 
     p = (pj_uint8_t*)frm + sizeof(pjmedia_frame_ext);
     for (i = 0; i < frm->subframe_cnt; ++i) {
-        pjmedia_frame_ext_subframe *fsub;
         fsub = (pjmedia_frame_ext_subframe*) p;
-        p += sizeof(fsub->bitlen) + (fsub->bitlen >> 3);
-        if (fsub->bitlen & 0x07)
-            ++p;
+        p += sizeof(fsub->bitlen) + ((fsub->bitlen+7) >> 3);
     }
 
-    tmp = bitlen >> 3;
-    if (bitlen & 0x07)
-        ++tmp;
-
-    pj_memcpy(p, &bitlen, sizeof(bitlen));
-    if (tmp)
-        pj_memcpy(p + sizeof(bitlen), src, tmp);
+    fsub = (pjmedia_frame_ext_subframe*) p;
+    fsub->bitlen = (pj_uint16_t)bitlen;
+    if (bitlen)
+        pj_memcpy(fsub->data, src, (bitlen+7) >> 3);
 
     frm->subframe_cnt++;
-    frm->samples_cnt = frm->samples_cnt + samples_cnt;
+    frm->samples_cnt = frm->samples_cnt + (pj_uint16_t)samples_cnt;
 }
 
@@ -349 +344 @@
         for (i = 0; i < n; ++i) {       
             sf = (pjmedia_frame_ext_subframe*) p;
-            p += sizeof(sf->bitlen) + (sf->bitlen >> 3);
-            if (sf->bitlen & 0x07)
-                ++p;
+            p += sizeof(sf->bitlen) + ((sf->bitlen+7) >> 3);
         }
         
@@ -384 +377 @@
     sf = pjmedia_frame_ext_get_subframe(frm, frm->subframe_cnt-1);
     move_len = (pj_uint8_t*)sf - move_src + sizeof(sf->bitlen) + 
-               (sf->bitlen >> 3);
-    if (sf->bitlen & 0x07)
-        ++move_len;
+               ((sf->bitlen+7) >> 3);
     pj_memmove((pj_uint8_t*)frm+sizeof(pjmedia_frame_ext), 
                move_src, move_len);