diff options
Diffstat (limited to 'pjmedia/src')
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/android_jni_dev.c | 4 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/android_dev.c | 8 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/avi_player.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/android_jni_dev.c b/pjmedia/src/pjmedia-audiodev/android_jni_dev.c index b6b47ad0..3944a289 100644 --- a/pjmedia/src/pjmedia-audiodev/android_jni_dev.c +++ b/pjmedia/src/pjmedia-audiodev/android_jni_dev.c @@ -544,7 +544,7 @@ static pj_status_t android_create_stream(pjmedia_aud_dev_factory *f, struct android_aud_stream *stream; pj_status_t status = PJ_SUCCESS; int state = 0; - int buffSize, inputBuffSizePlay, inputBuffSizeRec; + int buffSize, inputBuffSizePlay = 0, inputBuffSizeRec = 0; int channelInCfg, channelOutCfg, sampleFormat; jmethodID constructor_method=0, bufsize_method = 0; jmethodID method_id = 0; @@ -931,7 +931,7 @@ static pj_status_t strm_set_cap(pjmedia_aud_stream *s, { if (stream->track) { jmethodID vol_method = 0; - int retval; + int retval = 0; float vol = *(int *)value; attached = attach_jvm(&jni_env); diff --git a/pjmedia/src/pjmedia-videodev/android_dev.c b/pjmedia/src/pjmedia-videodev/android_dev.c index 1da72610..fd27cf2a 100644 --- a/pjmedia/src/pjmedia-videodev/android_dev.c +++ b/pjmedia/src/pjmedia-videodev/android_dev.c @@ -750,7 +750,7 @@ static pj_status_t and_factory_create_stream( const pjmedia_video_format_detail *vfd; const pjmedia_video_format_info *vfi; pjmedia_video_apply_fmt_param vafp; - pj_uint32_t and_fmt; + pj_uint32_t and_fmt = 0; unsigned convert_to_i420 = 0; pj_status_t status = PJ_SUCCESS; @@ -1107,12 +1107,12 @@ static void JNICALL OnGetFrame(JNIEnv *env, jobject obj, jbyteArray data, jint length, jlong user_data) { - and_stream *strm = *(and_stream**)&user_data; + and_stream *strm = (and_stream*)(intptr_t)user_data; pjmedia_frame f; pj_uint8_t *Y, *U, *V; pj_status_t status; - void *frame_buf, *data_buf; - + void *frame_buf, *data_buf; + strm->frame_ts.u64 += strm->ts_inc; if (!strm->vid_cb.capture_cb) return; diff --git a/pjmedia/src/pjmedia/avi_player.c b/pjmedia/src/pjmedia/avi_player.c index 15fa73a1..8cc9742e 100644 --- a/pjmedia/src/pjmedia/avi_player.c +++ b/pjmedia/src/pjmedia/avi_player.c @@ -44,7 +44,9 @@ #define AVI_EOF 0xFFEEFFEE -#define COMPARE_TAG(doc_tag, tag) (doc_tag == *((pj_uint32_t *)avi_tags[tag])) +//#define COMPARE_TAG(doc_tag, tag) (doc_tag==*((pj_uint32_t*)avi_tags[tag])) +#define COMPARE_TAG(doc_tag, tag) \ + (pj_memcmp(&(doc_tag), &avi_tags[tag], 4)==0) #define SIGNATURE PJMEDIA_SIG_PORT_VID_AVI_PLAYER |