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

Update moonlight-common-c with new encryption support

Browse Source
This commit is contained in:
Cameron Gutman 2024-01-15 14:54:59 -06:00
parent 4330a223c6
commit 7b13f12817
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/limelight/nvstream/http/NvHTTP.java
View File

@ -50,6 +50,7 @@ import com.limelight.BuildConfig;
import com.limelight.LimeLog;
import com.limelight.nvstream.ConnectionContext;
import com.limelight.nvstream.http.PairingManager.PairState;
import com.limelight.nvstream.jni.MoonBridge;
import okhttp3.ConnectionPool;
import okhttp3.HttpUrl;
@ -784,7 +785,8 @@ public class NvHTTP {
"&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo() +
"&remoteControllersBitmap=" + context.streamConfig.getAttachedGamepadMask() +
"&gcmap=" + context.streamConfig.getAttachedGamepadMask() +
"&gcpersist="+(context.streamConfig.getPersistGamepadsAfterDisconnect() ? 1 : 0));
"&gcpersist="+(context.streamConfig.getPersistGamepadsAfterDisconnect() ? 1 : 0) +
MoonBridge.getLaunchUrlQueryParameters());
if ((verb.equals("launch") && !getXmlString(xmlStr, "gamesession", true).equals("0") ||
(verb.equals("resume") && !getXmlString(xmlStr, "resume", true).equals("0")))) {
// sessionUrl0 will be missing for older GFE versions

2
app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
View File

@ -413,6 +413,8 @@ public class MoonBridge {
// The RTT is in the top 32 bits, and the RTT variance is in the bottom 32 bits
public static native long getEstimatedRttInfo();
public static native String getLaunchUrlQueryParameters();
public static native byte guessControllerType(int vendorId, int productId);
public static native boolean guessControllerHasPaddles(int vendorId, int productId);

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

@ -1 +1 @@
Subproject commit 6e9ed871bc3e013386c775b2ee7d31deb1151068
Subproject commit 298f356acbb57f56863680d41c0d307a2fd5cb91

5
app/src/main/jni/moonlight-core/simplejni.c
View File

@ -212,6 +212,11 @@ Java_com_limelight_nvstream_jni_MoonBridge_getEstimatedRttInfo(JNIEnv *env, jcla
return ((uint64_t)rtt << 32U) | variance;
}
JNIEXPORT jstring JNICALL
Java_com_limelight_nvstream_jni_MoonBridge_getLaunchUrlQueryParameters(JNIEnv *env, jclass clazz) {
return (*env)->NewStringUTF(env, LiGetLaunchUrlQueryParameters());
}
JNIEXPORT jbyte JNICALL
Java_com_limelight_nvstream_jni_MoonBridge_guessControllerType(JNIEnv *env, jclass clazz, jint vendorId, jint productId) {
unsigned int unDeviceID = MAKE_CONTROLLER_ID(vendorId, productId);