Misc (re #1782): Fixed various compile warnings on MSVC.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5045 74dad513-b988-da41-8d7b-12977e46ad98

5 files changed, 17 insertions, 10 deletions

diff --git a/pjmedia/src/pjmedia-codec/opencore_amr.c b/pjmedia/src/pjmedia-codec/opencore_amr.c
index 99ad54ef..b5931b96 100644
--- a/pjmedia/src/pjmedia-codec/opencore_amr.c
+++ b/pjmedia/src/pjmedia-codec/opencore_amr.c
@@ -568,7 +568,7 @@ static pj_status_t amr_codec_open( pjmedia_codec *codec,
 
     idx = (attr->info.clock_rate <= 8000? IDX_AMR_NB: IDX_AMR_WB);
     enc_mode = pjmedia_codec_amr_get_mode(attr->info.avg_bps);
-    pj_assert(enc_mode >= 0 && enc_mode < amr_bitrates_size[idx]);
+    pj_assert(enc_mode >= 0 && (unsigned)enc_mode < amr_bitrates_size[idx]);
 
     /* Check octet-align */
     for (i = 0; i < attr->setting.dec_fmtp.cnt; ++i) {
@@ -602,7 +602,7 @@ static pj_status_t amr_codec_open( pjmedia_codec *codec,
 	    p = pj_strbuf(&attr->setting.enc_fmtp.param[i].val);
 	    l = pj_strlen(&attr->setting.enc_fmtp.param[i].val);
 	    while (l--) {
-		if (*p>='0' && *p<=('0'+amr_bitrates_size[idx]-1)) {
+		if (*p>='0' && (unsigned)*p<=('0'+amr_bitrates_size[idx]-1)) {
 		    pj_int8_t tmp = *p - '0' - enc_mode;
 
 		    if (PJ_ABS(diff) > PJ_ABS(tmp) || 
@@ -897,8 +897,8 @@ static pj_status_t amr_codec_encode( pjmedia_codec *codec,
 	dtx_duration = pj_timestamp_diff32(&amr_data->last_tx, 
 					   &input->timestamp);
 	if (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 ||
-	    dtx_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*
-                           amr_data->clock_rate/1000)
+	    dtx_duration < (int)(PJMEDIA_CODEC_MAX_SILENCE_PERIOD*
+                                 amr_data->clock_rate/1000))
 	{
 	    output->size = 0;
 	    output->type = PJMEDIA_FRAME_TYPE_NONE;
diff --git a/pjmedia/src/pjmedia-codec/openh264.cpp b/pjmedia/src/pjmedia-codec/openh264.cpp
index fa57205b..4eeb2570 100644
--- a/pjmedia/src/pjmedia-codec/openh264.cpp
+++ b/pjmedia/src/pjmedia-codec/openh264.cpp
@@ -194,11 +194,14 @@ PJ_DEF(pj_status_t) pjmedia_codec_openh264_vid_init(pjmedia_vid_codec_mgr *mgr,
     status = pjmedia_sdp_neg_register_fmt_match_cb(
 					&h264_name,
 					&pjmedia_vid_codec_h264_match_sdp);
-    pj_assert(status == PJ_SUCCESS);
+    if (status != PJ_SUCCESS)
+	goto on_error;
 
     /* Register codec factory to codec manager. */
     status = pjmedia_vid_codec_mgr_register_factory(mgr,
 						    &oh264_factory.base);
+    if (status != PJ_SUCCESS)
+	goto on_error;
 
     PJ_LOG(4,(THIS_FILE, "OpenH264 codec initialized"));
 
@@ -372,6 +375,8 @@ static pj_status_t oh264_dealloc_codec(pjmedia_vid_codec_factory *factory,
 
     PJ_ASSERT_RETURN(codec, PJ_EINVAL);
 
+    PJ_UNUSED_ARG(factory);
+
     oh264_data = (oh264_codec_data*) codec->codec_data;
     if (oh264_data->enc) {
 	WelsDestroySVCEncoder(oh264_data->enc);
@@ -470,9 +475,10 @@ static pj_status_t oh264_codec_open(pjmedia_vid_codec *codec,
     eprm.sSpatialLayers[0].uiProfileIdc	= PRO_BASELINE;
     eprm.iPicWidth			= param->enc_fmt.det.vid.size.w;
     eprm.iPicHeight			= param->enc_fmt.det.vid.size.h;
-    eprm.fMaxFrameRate			= (param->enc_fmt.det.vid.fps.num * 1.0 /
+    eprm.fMaxFrameRate			= (param->enc_fmt.det.vid.fps.num *
+					   1.0f /
 					   param->enc_fmt.det.vid.fps.denum);
-    eprm.uiFrameToBeCoded		= -1;
+    eprm.uiFrameToBeCoded		= (unsigned int) -1;
     eprm.iTemporalLayerNum		= 1;
     eprm.uiIntraPeriod			= 0; /* I-Frame interval in frames */
     eprm.bEnableSpsPpsIdAddition	= (oh264_data->whole? false : true);
diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
index b816d044..438b3aec 100644
--- a/pjmedia/src/pjmedia/sdp_neg.c
+++ b/pjmedia/src/pjmedia/sdp_neg.c
@@ -1508,7 +1508,7 @@ static pj_status_t custom_fmt_match(pj_pool_t *pool,
 }
 
 /* Register customized SDP format negotiation callback function. */
-PJ_DECL(pj_status_t) pjmedia_sdp_neg_register_fmt_match_cb(
+PJ_DEF(pj_status_t) pjmedia_sdp_neg_register_fmt_match_cb(
 					const pj_str_t *fmt_name,
 					pjmedia_sdp_neg_fmt_match_cb cb)
 {
diff --git a/pjnath/src/pjnath/stun_transaction.c b/pjnath/src/pjnath/stun_transaction.c
index e9be0278..289c3a68 100644
--- a/pjnath/src/pjnath/stun_transaction.c
+++ b/pjnath/src/pjnath/stun_transaction.c
@@ -145,6 +145,7 @@ PJ_DEF(pj_status_t) pj_stun_client_tsx_destroy(pj_stun_client_tsx *tsx)
      * here.
      */
     /* pj_stun_client_tsx_stop(tsx); */
+    PJ_UNUSED_ARG(tsx);
     return PJ_SUCCESS;
 }
 
diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp
index 779bd945..18b75f13 100644
--- a/pjsip/src/pjsua2/media.cpp
+++ b/pjsip/src/pjsua2/media.cpp
@@ -1023,11 +1023,11 @@ VideoWindowInfo VideoWindow::getInfo() const throw(Error)
     pjsua_vid_win_info pj_vwi;
     
     PJSUA2_CHECK_EXPR( pjsua_vid_win_get_info(winId, &pj_vwi) );
-    vwi.isNative = pj_vwi.is_native;
+    vwi.isNative = (pj_vwi.is_native != PJ_FALSE);
     vwi.winHandle.type = pj_vwi.hwnd.type;
     vwi.winHandle.handle.window = pj_vwi.hwnd.info.window;
     vwi.renderDeviceId = pj_vwi.rdr_dev;
-    vwi.show = pj_vwi.show;
+    vwi.show = (pj_vwi.show != PJ_FALSE);
     vwi.pos.x = pj_vwi.pos.x;
     vwi.pos.y = pj_vwi.pos.y;
     vwi.size.w = pj_vwi.size.w;