moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update decoder code

Browse Source
This commit is contained in:
Cameron Gutman 2015-10-19 22:37:46 -07:00
parent c9014da186
commit ad10413714
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/jni/nv_opus_dec/nv_opus_dec_jni.c
View File

@ -3,19 +3,23 @@
#include <stdlib.h> #include <stdlib.h>
#include <jni.h> #include <jni.h>
static int SamplesPerChannel;
static int ChannelCount;
// This function must be called before // This function must be called before
// any other decoding functions // any other decoding functions
JNIEXPORT jint JNICALL JNIEXPORT jint JNICALL
Java_com_limelight_nvstream_av_audio_OpusDecoder_init(JNIEnv *env, jobject this, Java_com_limelight_nvstream_av_audio_OpusDecoder_init(JNIEnv *env, jobject this, int sampleRate,
int sampleRate, int channelCount, int streams, int samplesPerChannel, int channelCount, int streams,
int coupledStreams, jbyteArray mapping) { int coupledStreams, jbyteArray mapping) {
jbyte* jni_mapping_data; jbyte* jni_mapping_data;
jint ret; jint ret;
SamplesPerChannel = samplesPerChannel;
ChannelCount = channelCount;
jni_mapping_data = (*env)->GetByteArrayElements(env, mapping, 0); 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, jni_mapping_data);
(*env)->ReleaseByteArrayElements(env, mapping, jni_mapping_data, JNI_ABORT); (*env)->ReleaseByteArrayElements(env, mapping, jni_mapping_data, JNI_ABORT);
return ret; return ret;
@ -30,7 +34,7 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_destroy(JNIEnv *env, jobject th
// packets must be decoded in order // packets must be decoded in order
// a packet loss must call this function with NULL indata and 0 inlen // a packet loss must call this function with NULL indata and 0 inlen
// returns the number of decoded samples // returns the number of decoded bytes
JNIEXPORT jint JNICALL 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
@ -45,14 +49,18 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_decode(
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, (jshort*)jni_pcm_data, ret = nv_opus_decode(&jni_input_data[inoff], inlen, (jshort*)jni_pcm_data, SamplesPerChannel);
(*env)->GetArrayLength(env, outpcmdata)/2);
// 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, (jshort*)jni_pcm_data, (*env)->GetArrayLength(env, outpcmdata)/2); ret = nv_opus_decode(NULL, 0, (jshort*)jni_pcm_data, SamplesPerChannel);
}
// Convert samples (2 bytes) per channel to total bytes returned
if (ret > 0) {
ret *= ChannelCount * 2;
} }
(*env)->ReleaseByteArrayElements(env, outpcmdata, jni_pcm_data, 0); (*env)->ReleaseByteArrayElements(env, outpcmdata, jni_pcm_data, 0);