Changeset 4537 for pjproject/trunk/pjmedia/src/pjmedia-codec/h264_packetizer.c

Timestamp:

Jun 19, 2013 6:47:43 AM (11 years ago)

Author:

riza

Message:

Re #1680: Add initial support for Win64

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/h264_packetizer.c (modified) (8 diffs)

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

@@ -215 +215 @@
         else
             *payload_len = nal_end - nal_start + HEADER_SIZE_FU_A;
-        *pos = *payload + *payload_len - buf;
+        *pos = (unsigned)(*payload + *payload_len - buf);
 
 #if DBG_PACKETIZE
@@ -243 +243 @@
         nal[0] = nal_start;
         nal_size[0] = nal_end - nal_start;
-        total_size = nal_size[0] + HEADER_SIZE_STAP_A;
+        total_size = (int)nal_size[0] + HEADER_SIZE_STAP_A;
         NRI = (*nal_octet & 0x60) >> 5;
 
@@ -267 +267 @@
 
             /* Update total payload size (2 octet NAL size + NAL) */
-            total_size += (2 + nal_size[nal_cnt]);
+            total_size += (2 + (int)nal_size[nal_cnt]);
             if (total_size <= pktz->cfg.mtu) {
                 pj_uint8_t tmp_nri;
@@ -307 +307 @@
             pj_assert(*payload >= buf+*pos);
             *payload_len = p - *payload;
-            *pos = nal[nal_cnt-1] + nal_size[nal_cnt-1] - buf;
+            *pos = (unsigned)(nal[nal_cnt-1] + nal_size[nal_cnt-1] - buf);
 
 #if DBG_PACKETIZE
@@ -322 +322 @@
     *payload = nal_start;
     *payload_len = nal_end - nal_start;
-    *pos = nal_end - buf;
+    *pos = (unsigned)(nal_end - buf);
 
 #if DBG_PACKETIZE
@@ -400 +400 @@
 
         /* Update the bitstream writing offset */
-        *bits_pos = p - bits;
+        *bits_pos = (unsigned)(p - bits);
         pktz->unpack_last_sync_pos = *bits_pos;
 
@@ -451 +451 @@
 
             /* Update the bitstream writing offset */
-            *bits_pos = p - bits;
+            *bits_pos = (unsigned)(p - bits);
             pktz->unpack_last_sync_pos = *bits_pos;
         }
@@ -510 +510 @@
 
         /* Update the bitstream writing offset */
-        *bits_pos = p - bits;
+        *bits_pos = (unsigned)(p - bits);
         if (E) {
             /* Update the sync pos only if the end bit flag is set */