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

Timestamp:

Feb 1, 2009 2:10:49 PM (15 years ago)

Author:

nanang

Message:

• Fixed pjmedia_frame_ext helper functions, it didn't involve sizeof(bitlen) in calculating subframe address.
• Fixed audio switch board to handle such case that transmitter of port 0 has greater ptime, so it could save the remaining data in the TX buffer.
• Fixed audio swtich board in handling FRAME_TYPE_NONE.
• Updated audio switch board to handle keep alive mechanism.

File:

• pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/port.h (modified) (7 diffs)

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

@@ -265 +265 @@
  * are byte-aligned although its payload may not be byte-aligned.
  */
+
+#pragma pack(1)
 typedef struct pjmedia_frame_ext {
     pjmedia_frame   base;           /**< Base frame info */
@@ -274 +276 @@
      */
 } pjmedia_frame_ext;
+#pragma pack()
 
 /**
@@ -279 +282 @@
  * pjmedia_frame_ext structure.
  */
+#pragma pack(1)
 typedef struct pjmedia_frame_ext_subframe {
     pj_uint16_t     bitlen;         /**< Number of bits in the data */
@@ -284 +288 @@
 } pjmedia_frame_ext_subframe;
 
+#pragma pack()
+
 
 /**
@@ -305 +311 @@
         pjmedia_frame_ext_subframe *fsub;
         fsub = (pjmedia_frame_ext_subframe*) p;
-        p += fsub->bitlen / 8;
+        p += sizeof(fsub->bitlen) + fsub->bitlen / 8;
         if (fsub->bitlen % 8)
             ++p;
@@ -312 +318 @@
     tmp = bitlen / 8;
     if (bitlen % 8) ++tmp;
+
     pj_memcpy(p, &bitlen, sizeof(bitlen));
-    pj_memcpy(p + sizeof(bitlen), src, tmp);
+    if (tmp)
+        pj_memcpy(p + sizeof(bitlen), src, tmp);
+
     frm->subframe_cnt++;
     frm->samples_cnt = frm->samples_cnt + samples_cnt;
@@ -339 +348 @@
         for (i = 0; i < n; ++i) {       
             sf = (pjmedia_frame_ext_subframe*) p;
-            p += sf->bitlen / 8;
+            p += sizeof(sf->bitlen) + sf->bitlen / 8;
             if (sf->bitlen % 8)
                 ++p;