Changeset 4537 for pjproject/trunk/pjmedia/src/pjmedia/vid_stream.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/vid_stream.c (modified) (10 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -503 +503 @@
                                      "Error generating RTCP SDES"));
         } else {
-            len += sdes_len;
+            len += (int)sdes_len;
         }
     }
@@ -518 +518 @@
                                      "Error generating RTCP BYE"));
         } else {
-            len += bye_len;
+            len += (int)bye_len;
         }
     }
@@ -607 +607 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        LOGERR_((channel->port.info.name.ptr, "RTP recv() error", -bytes_read));
+        LOGERR_((channel->port.info.name.ptr, "RTP recv() error", 
+                (pj_status_t)-bytes_read));
         return;
     }
@@ -616 +617 @@
 
     /* Update RTP and RTCP session. */
-    status = pjmedia_rtp_decode_rtp(&channel->rtp, pkt, bytes_read,
+    status = pjmedia_rtp_decode_rtp(&channel->rtp, pkt, (int)bytes_read,
                                     &hdr, &payload, &payloadlen);
     if (status != PJ_SUCCESS) {
@@ -778 +779 @@
     if (bytes_read < 0) {
         LOGERR_((stream->cname.ptr, "RTCP recv() error", 
-                 -bytes_read));
+                 (pj_status_t)-bytes_read));
         return;
     }
@@ -870 +871 @@
                                         channel->pt,
                                         (has_more_data == PJ_FALSE ? 1 : 0),
-                                        frame_out.size,
+                                        (int)frame_out.size,
                                         rtp_ts_len,
                                         (const void**)&rtphdr,
@@ -900 +901 @@
         }
 
-        pjmedia_rtcp_tx_rtp(&stream->rtcp, frame_out.size);
+        pjmedia_rtcp_tx_rtp(&stream->rtcp, (unsigned)frame_out.size);
         total_sent += frame_out.size;
         pkt_cnt++;
@@ -1072 +1073 @@
         status = pjmedia_vid_codec_decode(stream->codec, cnt,
                                           stream->rx_frames,
-                                          frame->size, frame);
+                                          (unsigned)frame->size, frame);
         if (status != PJ_SUCCESS) {
             LOGERR_((channel->port.info.name.ptr, "codec decode() error",
@@ -1292 +1293 @@
         min_out_pkt_size =  sizeof(pjmedia_rtcp_sr_pkt) +
                             sizeof(pjmedia_rtcp_common) +
-                            (4 + stream->cname.slen) +
+                            (4 + (unsigned)stream->cname.slen) +
                             32;
 
@@ -1600 +1601 @@
     stream->out_rtcp_pkt_size =  sizeof(pjmedia_rtcp_sr_pkt) +
                                  sizeof(pjmedia_rtcp_common) +
-                                 (4 + stream->cname.slen) +
+                                 (4 + (unsigned)stream->cname.slen) +
                                  32;
     if (stream->out_rtcp_pkt_size > PJMEDIA_MAX_MTU)