diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2008-09-11 10:17:10 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2008-09-11 10:17:10 +0000 |
commit | b96da2717de701365dcb085e53879102e04e4232 (patch) | |
tree | 49d08208771f5e4dd8eee67d23c44e5e7a1cff2f /pjmedia/src | |
parent | 0713abf7556bacb5c4c32545996907548c179fdf (diff) |
Ticket #614: Fixed compilation warning of integer conversions.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2272 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
-rw-r--r-- | pjmedia/src/pjmedia/wav_player.c | 3 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/wav_writer.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia/wav_player.c b/pjmedia/src/pjmedia/wav_player.c index ab89dab6..30c2531e 100644 --- a/pjmedia/src/pjmedia/wav_player.c +++ b/pjmedia/src/pjmedia/wav_player.c @@ -264,7 +264,8 @@ PJ_DEF(pj_status_t) pjmedia_wav_player_port_create( pj_pool_t *pool, } 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 * fmt header data. diff --git a/pjmedia/src/pjmedia/wav_writer.c b/pjmedia/src/pjmedia/wav_writer.c index 5e5696fd..421ff0b6 100644 --- a/pjmedia/src/pjmedia/wav_writer.c +++ b/pjmedia/src/pjmedia/wav_writer.c @@ -124,13 +124,15 @@ PJ_DEF(pj_status_t) pjmedia_wav_writer_port_create( pj_pool_t *pool, 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; wave_hdr.data_hdr.len = 0; /* will be filled later */ |