From b02db2c182bc7abf18d7b1156094e8da8c0b23ec Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 19 Oct 2016 20:47:23 -0700 Subject: [PATCH] Fix JNI build warnings with modern NDKs --- app/src/main/jni/evdev_reader/evdev_reader.c | 2 ++ app/src/main/jni/nv_opus_dec/nv_opus_dec_jni.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/jni/evdev_reader/evdev_reader.c b/app/src/main/jni/evdev_reader/evdev_reader.c index 32fe2c5d..3652a99e 100644 --- a/app/src/main/jni/evdev_reader/evdev_reader.c +++ b/app/src/main/jni/evdev_reader/evdev_reader.c @@ -15,6 +15,8 @@ #include #include +#include + #include #define EVDEV_MAX_EVENT_SIZE 24 diff --git a/app/src/main/jni/nv_opus_dec/nv_opus_dec_jni.c b/app/src/main/jni/nv_opus_dec/nv_opus_dec_jni.c index fd1a31d2..33169d37 100644 --- a/app/src/main/jni/nv_opus_dec/nv_opus_dec_jni.c +++ b/app/src/main/jni/nv_opus_dec/nv_opus_dec_jni.c @@ -19,7 +19,8 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_init(JNIEnv *env, jobject this, ChannelCount = channelCount; jni_mapping_data = (*env)->GetByteArrayElements(env, mapping, 0); - ret = nv_opus_init(sampleRate, channelCount, streams, coupledStreams, jni_mapping_data); + ret = nv_opus_init(sampleRate, channelCount, streams, coupledStreams, + (const unsigned char*)jni_mapping_data); (*env)->ReleaseByteArrayElements(env, mapping, jni_mapping_data, JNI_ABORT); return ret; @@ -49,7 +50,8 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_decode( if (indata != NULL) { jni_input_data = (*env)->GetByteArrayElements(env, indata, 0); - ret = nv_opus_decode(&jni_input_data[inoff], inlen, (jshort*)jni_pcm_data, SamplesPerChannel); + ret = nv_opus_decode((unsigned char*)&jni_input_data[inoff], inlen, + (jshort*)jni_pcm_data, SamplesPerChannel); // The input data isn't changed so it can be safely aborted (*env)->ReleaseByteArrayElements(env, indata, jni_input_data, JNI_ABORT);