moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-04-20 07:10:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for missing changes in Opus JNI code

Browse Source
This commit is contained in:
Iwan Timmer
2014-01-07 21:20:55 +01:00
parent 5b29a2ef7b
commit 9dcd75b9dd
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jni/nv_opus_dec/nv_opus_dec.c
View File

@@ -2,6 +2,8 @@
#include <opus.h> #include <opus.h>
#include "nv_opus_dec.h" #include "nv_opus_dec.h"
#include <stdio.h>
OpusDecoder* decoder; OpusDecoder* decoder;
#ifdef _WIN32 #ifdef _WIN32
@@ -37,8 +39,8 @@ int nv_opus_get_channel_count(void) {
} }
// This number assumes 2 channels at 48 KHz // This number assumes 2 channels at 48 KHz
int nv_opus_get_max_out_bytes(void) { int nv_opus_get_max_out_shorts(void) {
return 1024*nv_opus_get_channel_count(); return 512*nv_opus_get_channel_count();
} }
// The Opus stream is 48 KHz // The Opus stream is 48 KHz
@@ -46,20 +48,17 @@ int nv_opus_get_sample_rate(void) {
return 48000; return 48000;
} }
// outpcmdata must be 11520*2 bytes in length // outpcmdata must be 5760*2 shorts in length
// 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 samples
int nv_opus_decode(unsigned char* indata, int inlen, unsigned char* outpcmdata) { int nv_opus_decode(unsigned char* indata, int inlen, short* outpcmdata) {
int err; int err;
// Decoding to 16-bit PCM with FEC off // Decoding to 16-bit PCM with FEC off
// Maximum length assuming 48KHz sample rate // Maximum length assuming 48KHz sample rate
err = opus_decode(decoder, indata, inlen, err = opus_decode(decoder, indata, inlen,
(opus_int16*) outpcmdata, 512, 0); outpcmdata, 512, 0);
if (err>0)
err = err * 2;
return err; return err;
} }

4
jni/nv_opus_dec/nv_opus_dec.h
View File

@@ -1,6 +1,6 @@
int nv_opus_init(void); int nv_opus_init(void);
void nv_opus_destroy(void); void nv_opus_destroy(void);
int nv_opus_get_channel_count(void); int nv_opus_get_channel_count(void);
int nv_opus_get_max_out_bytes(void); int nv_opus_get_max_out_shorts(void);
int nv_opus_get_sample_rate(void); int nv_opus_get_sample_rate(void);
int nv_opus_decode(unsigned char* indata, int inlen, unsigned char* outpcmdata); int nv_opus_decode(unsigned char* indata, int inlen, short* outpcmdata);

12
jni/nv_opus_dec/nv_opus_dec_jni.c
View File

@@ -3,6 +3,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <jni.h> #include <jni.h>
#include <stdio.h>
// 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
@@ -25,8 +27,8 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_getChannelCount(JNIEnv *env, jo
// This number assumes 2 channels at 48 KHz // This number assumes 2 channels at 48 KHz
JNIEXPORT jint JNICALL JNIEXPORT jint JNICALL
Java_com_limelight_nvstream_av_audio_OpusDecoder_getMaxOutputBytes(JNIEnv *env, jobject this) { Java_com_limelight_nvstream_av_audio_OpusDecoder_getMaxOutputShorts(JNIEnv *env, jobject this) {
return nv_opus_get_max_out_bytes(); return nv_opus_get_max_out_shorts();
} }
// The Opus stream is 48 KHz // The Opus stream is 48 KHz
@@ -52,14 +54,14 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_decode(
jni_pcm_data = (*env)->GetByteArrayElements(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)->ReleaseByteArrayElements(env, outpcmdata, jni_pcm_data, 0); (*env)->ReleaseByteArrayElements(env, outpcmdata, jni_pcm_data, 0);