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

Use a short[] for the audio buffer to avoid using deprecated AudioTrack functionality

Browse Source
This commit is contained in:
Cameron Gutman 2019-05-07 17:54:47 -07:00
parent ad94978f98
commit d48e964d05
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moonlight-common/src/main/java/com/limelight/nvstream/av/audio/AudioRenderer.java
View File

@ -7,7 +7,7 @@ public interface AudioRenderer {
void stop(); void stop();
void playDecodedAudio(byte[] audioData); void playDecodedAudio(short[] audioData);
void cleanup(); void cleanup();
} }

2
moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
View File

@ -111,7 +111,7 @@ public class MoonBridge {
} }
} }
public static void bridgeArPlaySample(byte[] pcmData) { public static void bridgeArPlaySample(short[] pcmData) {
if (audioRenderer != null) { if (audioRenderer != null) {
audioRenderer.playDecodedAudio(pcmData); audioRenderer.playDecodedAudio(pcmData);
} }

14
moonlight-common/src/main/jni/moonlight-core/callbacks.c
View File

@ -33,7 +33,7 @@ static jmethodID BridgeClConnectionTerminatedMethod;
static jmethodID BridgeClRumbleMethod; static jmethodID BridgeClRumbleMethod;
static jmethodID BridgeClConnectionStatusUpdateMethod; static jmethodID BridgeClConnectionStatusUpdateMethod;
static jbyteArray DecodedFrameBuffer; static jbyteArray DecodedFrameBuffer;
static jbyteArray DecodedAudioBuffer; static jshortArray DecodedAudioBuffer;
void DetachThread(void* context) { void DetachThread(void* context) {
(*JVM)->DetachCurrentThread(JVM); (*JVM)->DetachCurrentThread(JVM);
@ -84,7 +84,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_init(JNIEnv *env, jclass clazz) {
BridgeArStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStart", "()V"); BridgeArStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStart", "()V");
BridgeArStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStop", "()V"); BridgeArStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStop", "()V");
BridgeArCleanupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArCleanup", "()V"); BridgeArCleanupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArCleanup", "()V");
BridgeArPlaySampleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArPlaySample", "([B)V"); BridgeArPlaySampleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArPlaySample", "([S)V");
BridgeClStageStartingMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageStarting", "(I)V"); BridgeClStageStartingMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageStarting", "(I)V");
BridgeClStageCompleteMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageComplete", "(I)V"); BridgeClStageCompleteMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageComplete", "(I)V");
BridgeClStageFailedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageFailed", "(IJ)V"); BridgeClStageFailedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageFailed", "(IJ)V");
@ -224,7 +224,7 @@ int BridgeArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusCon
} }
// We know ahead of time what the buffer size will be for decoded audio, so pre-allocate it // We know ahead of time what the buffer size will be for decoded audio, so pre-allocate it
DecodedAudioBuffer = (*env)->NewGlobalRef(env, (*env)->NewByteArray(env, opusConfig->channelCount * opusConfig->samplesPerFrame * sizeof(short))); DecodedAudioBuffer = (*env)->NewGlobalRef(env, (*env)->NewShortArray(env, opusConfig->channelCount * opusConfig->samplesPerFrame));
} }
return err; return err;
@ -271,23 +271,23 @@ void BridgeArDecodeAndPlaySample(char* sampleData, int sampleLength) {
return; return;
} }
jbyte* decodedData = (*env)->GetByteArrayElements(env, DecodedAudioBuffer, 0); jshort* decodedData = (*env)->GetShortArrayElements(env, DecodedAudioBuffer, 0);
int decodeLen = opus_multistream_decode(Decoder, int decodeLen = opus_multistream_decode(Decoder,
(const unsigned char*)sampleData, (const unsigned char*)sampleData,
sampleLength, sampleLength,
(opus_int16*)decodedData, decodedData,
OpusConfig.samplesPerFrame, OpusConfig.samplesPerFrame,
0); 0);
if (decodeLen > 0) { if (decodeLen > 0) {
// We must release the array elements first to ensure the data is copied before the callback // We must release the array elements first to ensure the data is copied before the callback
(*env)->ReleaseByteArrayElements(env, DecodedAudioBuffer, decodedData, 0); (*env)->ReleaseShortArrayElements(env, DecodedAudioBuffer, decodedData, 0);
(*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArPlaySampleMethod, DecodedAudioBuffer); (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArPlaySampleMethod, DecodedAudioBuffer);
} }
else { else {
// We can abort here to avoid the copy back since no data was modified // We can abort here to avoid the copy back since no data was modified
(*env)->ReleaseByteArrayElements(env, DecodedAudioBuffer, decodedData, JNI_ABORT); (*env)->ReleaseShortArrayElements(env, DecodedAudioBuffer, decodedData, JNI_ABORT);
} }
} }