diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-08-10 09:11:39 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-08-10 09:11:39 +0000 |
| commit | cb4f89c389cd1065d4b46029aa5787aebf03a575 (patch) | |
| tree | 97a358bb1bac40a0258b91727fe8c9722fcf4968 | |
| parent | fb7f771decf21ed1338f2409dc67f4f181f92291 (diff) | |
Misc (re #1843): Fixed compile warnings of unused variable.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5157 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/android_jni_dev.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/util.c | 12 | ||||
| -rw-r--r-- | pjsip/src/pjsua2/media.cpp | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/android_jni_dev.c b/pjmedia/src/pjmedia-audiodev/android_jni_dev.c index fff847fe..6836ad62 100644 --- a/pjmedia/src/pjmedia-audiodev/android_jni_dev.c +++ b/pjmedia/src/pjmedia-audiodev/android_jni_dev.c @@ -298,6 +298,8 @@ static int AndroidRecorderCallback(void *userData) status = (*stream->rec_cb)(stream->user_data, &frame); (*jni_env)->ReleaseByteArrayElements(jni_env, inputBuffer, buf, JNI_ABORT); + if (status != PJ_SUCCESS || stream->quit_flag) + break; stream->rec_timestamp.u64 += stream->param.samples_per_frame / stream->param.channel_count; diff --git a/pjmedia/src/pjmedia-videodev/util.c b/pjmedia/src/pjmedia-videodev/util.c index b86c22b0..dafb698e 100644 --- a/pjmedia/src/pjmedia-videodev/util.c +++ b/pjmedia/src/pjmedia-videodev/util.c @@ -23,6 +23,8 @@ #include <pj/errno.h> #include <pj/log.h> +#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) + #if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 #include <libyuv.h> #define HAS_ROTATION 1 @@ -281,6 +283,9 @@ pj_status_t pjmedia_vid_dev_conv_resize_and_rotate(pjmedia_vid_dev_conv *conv, src_size.w, src_size.h, mode); swap(src, dst); +#else + PJ_UNUSED_ARG(p_len); + PJ_UNUSED_ARG(dst_size); #endif } } @@ -288,13 +293,12 @@ pj_status_t pjmedia_vid_dev_conv_resize_and_rotate(pjmedia_vid_dev_conv *conv, if (!conv->match_src_dst && conv->maintain_aspect_ratio) { /* Center the frame and fill the area with black color */ if (conv->fmt.id == PJMEDIA_FORMAT_I420) { - int i = 0; + unsigned i = 0; pj_uint8_t *pdst = dst; pj_uint8_t *psrc = src; - pj_size_t p_len_src, p_len_dst; + pj_size_t p_len_src = 0, p_len_dst = conv->wxh; int pad = conv->pad; - p_len_dst = conv->wxh; pj_bzero(pdst, p_len_dst); if (conv->fit_to_h) { @@ -357,3 +361,5 @@ void pjmedia_vid_dev_conv_destroy_converter(pjmedia_vid_dev_conv *conv) conv->conv = NULL; } } + +#endif /* PJMEDIA_HAS_VIDEO */ diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp index a53fcb10..ba443703 100644 --- a/pjsip/src/pjsua2/media.cpp +++ b/pjsip/src/pjsua2/media.cpp @@ -1158,6 +1158,7 @@ void VideoPreview::start(const VideoPreviewOpParam ¶m) throw(Error) PJSUA2_CHECK_EXPR(pjsua_vid_preview_start(devId, &prm)); #else PJ_UNUSED_ARG(param); + PJ_UNUSED_ARG(devId); #endif } |