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

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -529 +529 @@
                 frame_out.size = frame->size - samples_count*2;
                 status = pjmedia_codec_recover(stream->codec,
-                                               frame_out.size,
+                                               (unsigned)frame_out.size,
                                                &frame_out);
 
@@ -578 +578 @@
                         frame_out.size = frame->size - samples_count*2;
                         status = pjmedia_codec_recover(stream->codec,
-                                                       frame_out.size,
+                                                       (unsigned)frame_out.size,
                                                        &frame_out);
                         if (status != PJ_SUCCESS)
@@ -633 +633 @@
                     frame_out.size = frame->size - samples_count*2;
                     status = pjmedia_codec_recover(stream->codec,
-                                                   frame_out.size,
+                                                   (unsigned)frame_out.size,
                                                    &frame_out);
                     if (status != PJ_SUCCESS)
@@ -684 +684 @@
             frame_out.size = frame->size - samples_count*BYTES_PER_SAMPLE;
             status = pjmedia_codec_decode( stream->codec, &frame_in,
-                                           frame_out.size, &frame_out);
+                                           (unsigned)frame_out.size, 
+                                           &frame_out);
             if (status != 0) {
                 LOGERR_((port->info.name.ptr, "codec decode() error", 
@@ -1126 +1127 @@
             pj_bzero(stream->enc_buf + stream->enc_buf_count, frame->size);
         }
-        stream->enc_buf_count += (frame->size >> 1);
+        stream->enc_buf_count += ((unsigned)frame->size >> 1);
     }
 
@@ -1193 +1194 @@
     /* Number of samples in the frame */
     if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO)
-        ts_len = (frame->size >> 1) / stream->codec_param.info.channel_cnt;
+        ts_len = ((unsigned)frame->size >> 1) / 
+                 stream->codec_param.info.channel_cnt;
     else if (frame->type == PJMEDIA_FRAME_TYPE_EXTENDED)
         ts_len = PJMEDIA_PIA_SPF(&stream->port.info) /
@@ -1237 +1239 @@
         status = pjmedia_rtp_encode_rtp( &channel->rtp, 
                                          stream->tx_event_pt, first, 
-                                         frame_out.size,
+                                         (int)frame_out.size,
                                          (first ? rtp_ts_len : 0), 
                                          (const void**)&rtphdr, 
@@ -1296 +1298 @@
         status = pjmedia_rtp_encode_rtp( &channel->rtp, 
                                          channel->pt, 0, 
-                                         frame_out.size, rtp_ts_len, 
+                                         (int)frame_out.size, rtp_ts_len, 
                                          (const void**)&rtphdr, 
                                          &rtphdrlen);
@@ -1320 +1322 @@
         status = pjmedia_rtp_encode_rtp( &channel->rtp, 
                                          channel->pt, 0, 
-                                         frame_out.size, rtp_ts_len, 
+                                         (int)frame_out.size, rtp_ts_len, 
                                          (const void**)&rtphdr, 
                                          &rtphdrlen);
@@ -1392 +1394 @@
 
     /* Update stat */
-    pjmedia_rtcp_tx_rtp(&stream->rtcp, frame_out.size);
+    pjmedia_rtcp_tx_rtp(&stream->rtcp, (unsigned)frame_out.size);
     stream->rtcp.stat.rtp_tx_last_ts = pj_ntohl(stream->enc->rtp.out_hdr.ts);
     stream->rtcp.stat.rtp_tx_last_seq = pj_ntohs(stream->enc->rtp.out_hdr.seq);
@@ -1630 +1632 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        LOGERR_((stream->port.info.name.ptr, "RTP recv() error", -bytes_read));
+        LOGERR_((stream->port.info.name.ptr, "RTP recv() error", 
+                (pj_status_t)-bytes_read));
         return;
     }
@@ -1639 +1642 @@
 
     /* 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) {
@@ -1888 +1891 @@
     if (bytes_read < 0) {
         LOGERR_((stream->port.info.name.ptr, "RTCP recv() error", 
-                 -bytes_read));
+                (pj_status_t)-bytes_read));
         return;
     }
@@ -2299 +2302 @@
     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 defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
@@ -2465 +2468 @@
         status = pjmedia_rtp_encode_rtp( &channel->rtp,
                                          stream->tx_event_pt, first,
-                                         frame_out.size, 0,
+                                         (int)frame_out.size, 0,
                                          (const void**)&rtphdr,
                                          &rtphdrlen);
@@ -2767 +2770 @@
 
         /* Increment digit count only if all digits are valid. */
-        stream->tx_dtmf_count += digit_char->slen;
+        stream->tx_dtmf_count += (int)digit_char->slen;
     }