diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2015-04-06 06:13:51 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2015-04-06 06:13:51 +0000 |
commit | fa85ef1a15a35f7e6804dcf25a35e5ac8f8366b9 (patch) | |
tree | 61bc2a35fdec49cec8ffaf79c22e483a4c3e09cd /pjmedia/src/pjmedia-codec | |
parent | f8eb402d80f8ae9b1c1ab944dd8ec09b70cd3002 (diff) |
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
Diffstat (limited to 'pjmedia/src/pjmedia-codec')
-rw-r--r-- | pjmedia/src/pjmedia-codec/opencore_amr.c | 8 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/openh264.cpp | 12 |
2 files changed, 13 insertions, 7 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); |