moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-04-23 08:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update audio code for limelight-common changes

Browse Source
This commit is contained in:
Cameron Gutman
2014-01-10 01:04:42 -06:00
parent 023c5e31ac
commit 81ae7bd638
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jni/nv_opus_dec/nv_opus_dec_jni.c
View File

@@ -43,26 +43,26 @@ JNIEXPORT jint JNICALL
Java_com_limelight_nvstream_av_audio_OpusDecoder_decode( Java_com_limelight_nvstream_av_audio_OpusDecoder_decode(
JNIEnv *env, jobject this, // JNI parameters JNIEnv *env, jobject this, // JNI parameters
jbyteArray indata, jint inoff, jint inlen, // Input parameters jbyteArray indata, jint inoff, jint inlen, // Input parameters
jshortArray outpcmdata) // Output parameter jbyteArray outpcmdata) // Output parameter
{ {
jint ret; jint ret;
jbyte* jni_input_data; 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) { if (indata != NULL) {
jni_input_data = (*env)->GetByteArrayElements(env, indata, 0); 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 // The input data isn't changed so it can be safely aborted
(*env)->ReleaseByteArrayElements(env, indata, jni_input_data, JNI_ABORT); (*env)->ReleaseByteArrayElements(env, indata, jni_input_data, JNI_ABORT);
} }
else { 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; return ret;
} }

2
src/com/limelight/binding/audio/AndroidAudioRenderer.java
View File

@@ -37,7 +37,7 @@ public class AndroidAudioRenderer implements AudioRenderer {
} }
@Override @Override
public void playDecodedAudio(short[] audioData, int offset, int length) { public void playDecodedAudio(byte[] audioData, int offset, int length) {
track.write(audioData, offset, length); track.write(audioData, offset, length);
} }