From 81ae7bd638410ffce021e494a0483b297a7bb28d Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 10 Jan 2014 01:04:42 -0600 Subject: [PATCH] Update audio code for limelight-common changes --- jni/nv_opus_dec/nv_opus_dec_jni.c | 12 ++++++------ .../binding/audio/AndroidAudioRenderer.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jni/nv_opus_dec/nv_opus_dec_jni.c b/jni/nv_opus_dec/nv_opus_dec_jni.c index 1df69883..01d22791 100644 --- a/jni/nv_opus_dec/nv_opus_dec_jni.c +++ b/jni/nv_opus_dec/nv_opus_dec_jni.c @@ -43,26 +43,26 @@ JNIEXPORT jint JNICALL Java_com_limelight_nvstream_av_audio_OpusDecoder_decode( JNIEnv *env, jobject this, // JNI parameters jbyteArray indata, jint inoff, jint inlen, // Input parameters - jshortArray outpcmdata) // Output parameter + jbyteArray outpcmdata) // Output parameter { jint ret; jbyte* jni_input_data; - jshort* jni_pcm_data; + jbyte* jni_pcm_data; - jni_pcm_data = (*env)->GetShortArrayElements(env, outpcmdata, 0); + jni_pcm_data = (*env)->GetByteArrayElements(env, outpcmdata, 0); if (indata != NULL) { jni_input_data = (*env)->GetByteArrayElements(env, indata, 0); - ret = nv_opus_decode(&jni_input_data[inoff], inlen, jni_pcm_data); + ret = nv_opus_decode(&jni_input_data[inoff], inlen, (jshort*)jni_pcm_data); // The input data isn't changed so it can be safely aborted (*env)->ReleaseByteArrayElements(env, indata, jni_input_data, JNI_ABORT); } else { - ret = nv_opus_decode(NULL, 0, jni_pcm_data); + ret = nv_opus_decode(NULL, 0, (jshort*)jni_pcm_data); } - (*env)->ReleaseShortArrayElements(env, outpcmdata, jni_pcm_data, 0); + (*env)->ReleaseByteArrayElements(env, outpcmdata, jni_pcm_data, 0); return ret; } diff --git a/src/com/limelight/binding/audio/AndroidAudioRenderer.java b/src/com/limelight/binding/audio/AndroidAudioRenderer.java index d02e3cd6..2eedd955 100644 --- a/src/com/limelight/binding/audio/AndroidAudioRenderer.java +++ b/src/com/limelight/binding/audio/AndroidAudioRenderer.java @@ -37,7 +37,7 @@ public class AndroidAudioRenderer implements AudioRenderer { } @Override - public void playDecodedAudio(short[] audioData, int offset, int length) { + public void playDecodedAudio(byte[] audioData, int offset, int length) { track.write(audioData, offset, length); }