Changeset 2272 for pjproject/trunk

Timestamp:

Sep 11, 2008 10:17:10 AM (16 years ago)

Author:

nanang

Message:

Ticket #614: Fixed compilation warning of integer conversions.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• wav_player.c (modified) (1 diff)
• wav_writer.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -265 +265 @@
 
     fport->fmt_tag = wave_hdr.fmt_hdr.fmt_tag;
-    fport->bytes_per_sample = wave_hdr.fmt_hdr.bits_per_sample / 8;
+    fport->bytes_per_sample = (pj_uint16_t) 
+                              (wave_hdr.fmt_hdr.bits_per_sample / 8);
 
     /* If length of fmt_header is greater than 16, skip the remaining

pjproject/trunk/pjmedia/src/pjmedia/wav_writer.c

@@ -125 +125 @@
     wave_hdr.fmt_hdr.fmt = PJMEDIA_FMT_TAG;
     wave_hdr.fmt_hdr.len = 16;
-    wave_hdr.fmt_hdr.fmt_tag = fport->fmt_tag;
+    wave_hdr.fmt_hdr.fmt_tag = (pj_uint16_t)fport->fmt_tag;
     wave_hdr.fmt_hdr.nchan = (pj_int16_t)channel_count;
     wave_hdr.fmt_hdr.sample_rate = sampling_rate;
     wave_hdr.fmt_hdr.bytes_per_sec = sampling_rate * channel_count * 
                                      fport->bytes_per_sample;
-    wave_hdr.fmt_hdr.block_align = fport->bytes_per_sample * channel_count;
-    wave_hdr.fmt_hdr.bits_per_sample = fport->bytes_per_sample * 8;
+    wave_hdr.fmt_hdr.block_align = (pj_uint16_t)
+                                   (fport->bytes_per_sample * channel_count);
+    wave_hdr.fmt_hdr.bits_per_sample = (pj_uint16_t)
+                                       (fport->bytes_per_sample * 8);
 
     wave_hdr.data_hdr.data = PJMEDIA_DATA_TAG;