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 to latest moonlight-common-c

Browse Source
This commit is contained in:
Cameron Gutman 2017-06-11 13:52:00 -07:00
parent 164e6f83d8
commit f4abc66eeb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
#include <Limelight.h> #include <Limelight.h>
#include <opus_multistream.h> #include <opus_multistream.h>
#include <android/log.h>
#define PCM_FRAME_SIZE 240 #define PCM_FRAME_SIZE 240
@ -178,7 +179,7 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {
decodeUnit->receiveTimeMs); decodeUnit->receiveTimeMs);
} }
int BridgeArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig) { int BridgeArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, void* context, int flags) {
JNIEnv* env = GetThreadEnv(); JNIEnv* env = GetThreadEnv();
int err; int err;
@ -341,6 +342,13 @@ void BridgeClDisplayTransientMessage(const char* message) {
(*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClDisplayTransientMessageMethod, (*env)->NewStringUTF(env, message)); (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClDisplayTransientMessageMethod, (*env)->NewStringUTF(env, message));
} }
void BridgeClLogMessage(const char* format, ...) {
va_list va;
va_start(va, format);
__android_log_vprint(ANDROID_LOG_INFO, "moonlight-common-c", format, va);
va_end(va);
}
static DECODER_RENDERER_CALLBACKS BridgeVideoRendererCallbacks = { static DECODER_RENDERER_CALLBACKS BridgeVideoRendererCallbacks = {
.setup = BridgeDrSetup, .setup = BridgeDrSetup,
.start = BridgeDrStart, .start = BridgeDrStart,
@ -365,6 +373,7 @@ static CONNECTION_LISTENER_CALLBACKS BridgeConnListenerCallbacks = {
.connectionTerminated = BridgeClConnectionTerminated, .connectionTerminated = BridgeClConnectionTerminated,
.displayMessage = BridgeClDisplayMessage, .displayMessage = BridgeClDisplayMessage,
.displayTransientMessage = BridgeClDisplayTransientMessage, .displayTransientMessage = BridgeClDisplayTransientMessage,
.logMessage = BridgeClLogMessage,
}; };
JNIEXPORT jint JNICALL JNIEXPORT jint JNICALL
@ -401,7 +410,13 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jobject
BridgeVideoRendererCallbacks.capabilities = videoCapabilities; BridgeVideoRendererCallbacks.capabilities = videoCapabilities;
int ret = LiStartConnection(&serverInfo, &streamConfig, &BridgeConnListenerCallbacks, &BridgeVideoRendererCallbacks, &BridgeAudioRendererCallbacks, NULL, 0); int ret = LiStartConnection(&serverInfo,
&streamConfig,
&BridgeConnListenerCallbacks,
&BridgeVideoRendererCallbacks,
&BridgeAudioRendererCallbacks,
NULL, 0,
NULL, 0);
(*env)->ReleaseStringUTFChars(env, address, serverInfo.address); (*env)->ReleaseStringUTFChars(env, address, serverInfo.address);
(*env)->ReleaseStringUTFChars(env, appVersion, serverInfo.serverInfoAppVersion); (*env)->ReleaseStringUTFChars(env, appVersion, serverInfo.serverInfoAppVersion);

2
moonlight-common/src/main/jni/moonlight-core/moonlight-common-c

@ -1 +1 @@
Subproject commit 88f95c787103f4f5b4b38bd02e9fd0d15e430e44 Subproject commit 357926556046427aa5dda597ae73dc5a8d0d8bed