Changeset 376:f578a8e1ab84 in mediastreamer2

Timestamp:

Mar 28, 2009 4:36:44 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

Fix warnings on msvc compiler

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@379 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2/src

Files:

• mire.c (modified) (1 diff)
• msresample.c (modified) (2 diffs)
• msrtp.c (modified) (3 diffs)
• msspeex.c (modified) (1 diff)
• sizeconv.c (modified) (2 diffs)
• videodec.c (modified) (1 diff)

linphone/mediastreamer2/src/mire.c

@@ -78 +78 @@
 void mire_process(MSFilter *f){
         MireData *d=(MireData*)f->data;
-        float elapsed=f->ticker->time-d->starttime;
+        float elapsed=(float)(f->ticker->time-d->starttime);
         if ((elapsed*d->fps/1000.0)>d->index){
                 mire_draw(d);

linphone/mediastreamer2/src/msresample.c

@@ -98 +98 @@
 
                 int i;
+                spx_uint32_t idx;
     
                 in = (float*) alloca((size_of_input/2)*sizeof(float));
@@ -112 +113 @@
                 /* ms_message("resampling info: err=%i in_len=%i, out_len=%i", err, in_len, out_len); */
 
-                for (i=0;i<out_len;i++)
-                  data_out[i]=floor(.5+out[i]);
+                for (idx=0;idx<out_len;idx++)
+                  data_out[idx]=(short)floor(.5+out[idx]);
                 obl->b_wptr=obl->b_wptr+(out_len*2); /* size_of_output; */
 

linphone/mediastreamer2/src/msrtp.c

@@ -36 +36 @@
         char relay_session_id[64];
         int relay_session_id_size;
-        unsigned int last_rsi_time;
+        uint64_t last_rsi_time;
         bool_t skip;
         bool_t mute_mic;
@@ -124 +124 @@
 {
         SenderData *d = (SenderData *) f->data;
-#if !defined(_WIN32_WCE)
-        uint32_t curts = (f->ticker->time * d->rate) / 1000LL;
-#else
-        uint32_t curts = (f->ticker->time * d->rate) / ((uint64_t)1000);
-#endif
+        uint32_t curts = (uint32_t)(f->ticker->time * (d->rate/1000));
         int diff;
         int delta = d->rate / 50;       /*20 ms at 8000Hz */
@@ -323 +319 @@
                 return;
 
-        timestamp = (f->ticker->time * d->rate) / ((uint64_t)1000);
+        timestamp = (uint32_t) (f->ticker->time * (d->rate/1000));
         while ((m = rtp_session_recvm_with_ts(d->session, timestamp)) != NULL) {
                 mblk_set_timestamp_info(m, rtp_get_timestamp(m));

linphone/mediastreamer2/src/msspeex.c

@@ -191 +191 @@
                 /* convert from network bitrate to codec bitrate:*/
                 /* ((nbr/(50*8)) -20-12-8)*50*8*/
-                int cbr=(((float)s->maxbitrate/(50.0*8))-20-12-8)*50*8;
+                int cbr=(int)( (((float)s->maxbitrate/(50.0*8))-20-12-8)*50*8);
                 if (speex_encoder_ctl(s->state,SPEEX_SET_BITRATE,&cbr)!=0){
                         ms_error("Could not set maxbitrate %i to speex encoder.",s->bitrate);

linphone/mediastreamer2/src/sizeconv.c

@@ -119 +119 @@
 
         if (s->frame_count==-1){
-                s->start_time=f->ticker->time;
+                s->start_time=(float)f->ticker->time;
                 s->frame_count=0;
         }
@@ -126 +126 @@
         }
 
-        cur_frame=((f->ticker->time-s->start_time)*s->fps/1000.0);
+        cur_frame=(int)((f->ticker->time-s->start_time)*s->fps/1000.0);
         if (cur_frame<=s->frame_count && s->fps>=0) {
                 /* too much frame */

linphone/mediastreamer2/src/videodec.c

@@ -111 +111 @@
                         octet[0]=config[i];
                         octet[1]=config[i+1];
-                        s->dci[j]=strtol(octet,NULL,16);
+                        s->dci[j]=(uint8_t)strtol(octet,NULL,16);
                 }
                 s->dci_size=j;