Changeset 377:08275ffdec76 in mediastreamer2

Timestamp:

Mar 28, 2009 4:38:04 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@380 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2/src

Files:

• videostream.c (modified) (2 diffs)
• winvideo2.c (modified) (2 diffs)

linphone/mediastreamer2/src/videostream.c

@@ -129 +129 @@
                                 float flost;
                                 ij=report_block_get_interarrival_jitter(rb);
-                                flost=100.0*report_block_get_fraction_lost(rb)/256.0;
+                                flost=(float)(100.0*report_block_get_fraction_lost(rb)/256.0);
                                 ms_message("interarrival jitter=%u , lost packets percentage since last report=%f ",ij,flost);
                                 if (stream->adapt_bitrate) video_stream_adapt_bitrate(stream,ij,flost);
@@ -361 +361 @@
         MSVideoSize vsize=disp_size;
         MSPixFmt format;
-        float fps=29.97;
+        float fps=(float)29.97;
         int mirroring=1;
 

linphone/mediastreamer2/src/winvideo2.c

@@ -367 +367 @@
 
         if (s->frame_count==-1){
-                s->start_time=obj->ticker->time;
+                s->start_time=(float)obj->ticker->time;
                 s->frame_count=0;
         }
 
-        cur_frame=((obj->ticker->time-s->start_time)*s->fps/1000.0);
+        cur_frame=(int)((obj->ticker->time-s->start_time)*s->fps/1000.0);
         if (cur_frame>s->frame_count){
                 mblk_t *om=NULL;
@@ -386 +386 @@
                 }
                 if (om!=NULL){
-                        timestamp=obj->ticker->time*90;/* rtp uses a 90000 Hz clockrate for video*/
+                        timestamp=(uint32_t)(obj->ticker->time*90);/* rtp uses a 90000 Hz clockrate for video*/
                         mblk_set_timestamp_info(om,timestamp);
                         ms_queue_put(obj->outputs[0],om);