diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2015-08-25 08:45:46 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2015-08-25 08:45:46 +0000 |
commit | 7ffa781dc39a7274692d8db11043b3a9e92e36ce (patch) | |
tree | 77653933e1c211dbec6c125da9ec5c28f9eeaa4e /pjmedia | |
parent | 1b41ed3f7c9361106a585c1fe43d2338ab94cacc (diff) |
Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5170 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/src/pjmedia/endpoint.c | 24 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/sdp_neg.c | 10 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/tonegen.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/wav_player.c | 4 | ||||
-rw-r--r-- | pjmedia/src/test/codec_vectors.c | 28 | ||||
-rw-r--r-- | pjmedia/src/test/mips_test.c | 4 |
6 files changed, 37 insertions, 39 deletions
diff --git a/pjmedia/src/pjmedia/endpoint.c b/pjmedia/src/pjmedia/endpoint.c index de7c3201..9a8dbb22 100644 --- a/pjmedia/src/pjmedia/endpoint.c +++ b/pjmedia/src/pjmedia/endpoint.c @@ -484,7 +484,7 @@ PJ_DEF(pj_status_t) pjmedia_endpt_create_audio_sdp(pjmedia_endpt *endpt, if (codec_param.setting.dec_fmtp.cnt > 0) { enum { MAX_FMTP_STR_LEN = 160 }; char buf[MAX_FMTP_STR_LEN]; - unsigned buf_len = 0, i; + unsigned buf_len = 0, ii; pjmedia_codec_fmtp *dec_fmtp = &codec_param.setting.dec_fmtp; /* Print codec PT */ @@ -493,36 +493,36 @@ PJ_DEF(pj_status_t) pjmedia_endpt_create_audio_sdp(pjmedia_endpt *endpt, "%d", codec_info->pt); - for (i = 0; i < dec_fmtp->cnt; ++i) { + for (ii = 0; ii < dec_fmtp->cnt; ++ii) { pj_size_t test_len = 2; /* Check if buf still available */ - test_len = dec_fmtp->param[i].val.slen + - dec_fmtp->param[i].name.slen + 2; + test_len = dec_fmtp->param[ii].val.slen + + dec_fmtp->param[ii].name.slen + 2; if (test_len + buf_len >= MAX_FMTP_STR_LEN) return PJ_ETOOBIG; /* Print delimiter */ buf_len += pj_ansi_snprintf(&buf[buf_len], MAX_FMTP_STR_LEN - buf_len, - (i == 0?" ":";")); + (ii == 0?" ":";")); /* Print an fmtp param */ - if (dec_fmtp->param[i].name.slen) + if (dec_fmtp->param[ii].name.slen) buf_len += pj_ansi_snprintf( &buf[buf_len], MAX_FMTP_STR_LEN - buf_len, "%.*s=%.*s", - (int)dec_fmtp->param[i].name.slen, - dec_fmtp->param[i].name.ptr, - (int)dec_fmtp->param[i].val.slen, - dec_fmtp->param[i].val.ptr); + (int)dec_fmtp->param[ii].name.slen, + dec_fmtp->param[ii].name.ptr, + (int)dec_fmtp->param[ii].val.slen, + dec_fmtp->param[ii].val.ptr); else buf_len += pj_ansi_snprintf(&buf[buf_len], MAX_FMTP_STR_LEN - buf_len, "%.*s", - (int)dec_fmtp->param[i].val.slen, - dec_fmtp->param[i].val.ptr); + (int)dec_fmtp->param[ii].val.slen, + dec_fmtp->param[ii].val.ptr); } attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr); diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c index 4a6832c4..3344157b 100644 --- a/pjmedia/src/pjmedia/sdp_neg.c +++ b/pjmedia/src/pjmedia/sdp_neg.c @@ -1176,18 +1176,18 @@ static pj_status_t match_offer(pj_pool_t *pool, { /* Match! */ if (is_codec) { - pjmedia_sdp_media *o, *a; + pjmedia_sdp_media *o_med, *a_med; unsigned o_fmt_idx, a_fmt_idx; - o = (pjmedia_sdp_media*)offer; - a = (pjmedia_sdp_media*)preanswer; + o_med = (pjmedia_sdp_media*)offer; + a_med = (pjmedia_sdp_media*)preanswer; o_fmt_idx = prefer_remote_codec_order? i:j; a_fmt_idx = prefer_remote_codec_order? j:i; /* Call custom format matching callbacks */ if (custom_fmt_match(pool, &or_.enc_name, - o, o_fmt_idx, - a, a_fmt_idx, + o_med, o_fmt_idx, + a_med, a_fmt_idx, ALLOW_MODIFY_ANSWER) != PJ_SUCCESS) { diff --git a/pjmedia/src/pjmedia/tonegen.c b/pjmedia/src/pjmedia/tonegen.c index ea7c7bf2..ed512881 100644 --- a/pjmedia/src/pjmedia/tonegen.c +++ b/pjmedia/src/pjmedia/tonegen.c @@ -665,16 +665,16 @@ static pj_status_t tonegen_get_frame(pjmedia_port *port, { /* Fade in */ short *samp = (dst - cnt); - short *end; + short *samp_end; if (cnt > tonegen->fade_in_len) cnt = tonegen->fade_in_len; - end = samp + cnt; + samp_end = samp + cnt; if (cnt) { const unsigned step = 0xFFFF / cnt; unsigned scale = 0; - for (; samp < end; ++samp) { + for (; samp < samp_end; ++samp) { (*samp) = (short)(((*samp) * scale) >> 16); scale += step; } diff --git a/pjmedia/src/pjmedia/wav_player.c b/pjmedia/src/pjmedia/wav_player.c index 1e9a92ca..ba1d1575 100644 --- a/pjmedia/src/pjmedia/wav_player.c +++ b/pjmedia/src/pjmedia/wav_player.c @@ -580,15 +580,13 @@ static pj_status_t file_get_frame(pjmedia_port *this_port, { struct file_reader_port *fport = (struct file_reader_port*)this_port; pj_size_t frame_size; - pj_status_t status; + pj_status_t status = PJ_SUCCESS; pj_assert(fport->base.info.signature == SIGNATURE); pj_assert(frame->size <= fport->bufsize); /* EOF is set and readpos already passed the eofpos */ if (fport->eof && fport->readpos >= fport->eofpos) { - pj_status_t status = PJ_SUCCESS; - PJ_LOG(5,(THIS_FILE, "File port %.*s EOF", (int)fport->base.info.name.slen, fport->base.info.name.ptr)); diff --git a/pjmedia/src/test/codec_vectors.c b/pjmedia/src/test/codec_vectors.c index bce41545..167629d3 100644 --- a/pjmedia/src/test/codec_vectors.c +++ b/pjmedia/src/test/codec_vectors.c @@ -159,14 +159,14 @@ static int codec_test_encode(pjmedia_codec_mgr *mgr, pos = 0; for (;;) { - pj_size_t count; + pj_size_t count2; - count = fread(in_frame.buf, encoded_frame_len, 1, fref); - if (count != 1) + count2 = fread(in_frame.buf, encoded_frame_len, 1, fref); + if (count2 != 1) break; - count = fread(out_frame.buf, encoded_frame_len, 1, output); - if (count != 1) + count2 = fread(out_frame.buf, encoded_frame_len, 1, output); + if (count2 != 1) break; if (memcmp(in_frame.buf, out_frame.buf, encoded_frame_len)) { @@ -380,7 +380,7 @@ static int codec_test_decode(pjmedia_codec_mgr *mgr, for (;;) { pjmedia_frame in_frame[2]; pj_timestamp ts; - unsigned count; + unsigned count2; pj_bool_t has_frame; if (is_itu_format) { @@ -401,15 +401,15 @@ static int codec_test_decode(pjmedia_codec_mgr *mgr, } if (has_frame) { - count = 2; + count2 = 2; if (pjmedia_codec_parse(codec, pkt, encoded_len, &ts, - &count, in_frame) != PJ_SUCCESS) + &count2, in_frame) != PJ_SUCCESS) { rc = -100; goto on_return; } - if (count != 1) { + if (count2 != 1) { rc = -110; goto on_return; } @@ -459,14 +459,14 @@ static int codec_test_decode(pjmedia_codec_mgr *mgr, pos = 0; for (;;) { - pj_size_t count; + pj_size_t count2; - count = fread(pkt, samples_per_frame*2, 1, fref); - if (count != 1) + count2 = fread(pkt, samples_per_frame*2, 1, fref); + if (count2 != 1) break; - count = fread(out_frame.buf, samples_per_frame*2, 1, output); - if (count != 1) + count2 = fread(out_frame.buf, samples_per_frame*2, 1, output); + if (count2 != 1) break; if (memcmp(pkt, out_frame.buf, samples_per_frame*2)) { diff --git a/pjmedia/src/test/mips_test.c b/pjmedia/src/test/mips_test.c index 9c586cc1..e372613b 100644 --- a/pjmedia/src/test/mips_test.c +++ b/pjmedia/src/test/mips_test.c @@ -2490,7 +2490,7 @@ int mips_test(void) #endif }; - unsigned i, c, k[3] = {K8, K16, K32}, clock_rates[3] = {8000, 16000, 32000}; + unsigned i, c, clks[3] = {K8, K16, K32}, clock_rates[3] = {8000, 16000, 32000}; PJ_LOG(3,(THIS_FILE, "MIPS test, with CPU=%dMhz, %6.1f MIPS", CPU_MHZ, CPU_IPS / 1000000)); PJ_LOG(3,(THIS_FILE, "Clock Item Time CPU MIPS")); @@ -2509,7 +2509,7 @@ int mips_test(void) float cpu_pct, mips_val; unsigned j, clock_rate = clock_rates[c]; - if ((e->valid_clock_rate & k[c]) == 0) + if ((e->valid_clock_rate & clks[c]) == 0) continue; /* Run test */ |