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

Plumb clientRefreshRateX100 for modern GFE versions

Browse Source
This commit is contained in:
Cameron Gutman 2018-02-03 22:02:53 -08:00
parent 7dcc689014
commit 772835689d
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
View File

@ -271,6 +271,7 @@ public class NvConnection {
context.streamConfig.getHevcSupported(), context.streamConfig.getHevcSupported(),
context.negotiatedHdr, context.negotiatedHdr,
context.streamConfig.getHevcBitratePercentageMultiplier(), context.streamConfig.getHevcBitratePercentageMultiplier(),
context.streamConfig.getClientRefreshRateX100(),
context.riKey.getEncoded(), ib.array(), context.riKey.getEncoded(), ib.array(),
context.videoCapabilities); context.videoCapabilities);
if (ret != 0) { if (ret != 0) {

10
moonlight-common/src/main/java/com/limelight/nvstream/StreamConfiguration.java
View File

@ -15,6 +15,7 @@ public class StreamConfiguration {
private NvApp app; private NvApp app;
private int width, height; private int width, height;
private int refreshRate; private int refreshRate;
private int clientRefreshRateX100;
private int bitrate; private int bitrate;
private boolean sops; private boolean sops;
private boolean enableAdaptiveResolution; private boolean enableAdaptiveResolution;
@ -103,6 +104,11 @@ public class StreamConfiguration {
return this; return this;
} }
public StreamConfiguration.Builder setClientRefreshRateX100(int refreshRateX100) {
config.clientRefreshRateX100 = refreshRateX100;
return this;
}
public StreamConfiguration.Builder setAudioConfiguration(int audioConfig) { public StreamConfiguration.Builder setAudioConfiguration(int audioConfig) {
if (audioConfig == MoonBridge.AUDIO_CONFIGURATION_STEREO) { if (audioConfig == MoonBridge.AUDIO_CONFIGURATION_STEREO) {
config.audioChannelCount = CHANNEL_COUNT_STEREO; config.audioChannelCount = CHANNEL_COUNT_STEREO;
@ -215,4 +221,8 @@ public class StreamConfiguration {
public int getAttachedGamepadMask() { public int getAttachedGamepadMask() {
return attachedGamepadMask; return attachedGamepadMask;
} }
public int getClientRefreshRateX100() {
return clientRefreshRateX100;
}
} }

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

@ -174,6 +174,7 @@ public class MoonBridge {
int audioConfiguration, boolean supportsHevc, int audioConfiguration, boolean supportsHevc,
boolean enableHdr, boolean enableHdr,
int hevcBitratePercentageMultiplier, int hevcBitratePercentageMultiplier,
int clientRefreshRateX100,
byte[] riAesKey, byte[] riAesIv, byte[] riAesKey, byte[] riAesIv,
int videoCapabilities); int videoCapabilities);

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

@ -405,6 +405,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jobject
jint audioConfiguration, jboolean supportsHevc, jint audioConfiguration, jboolean supportsHevc,
jboolean enableHdr, jboolean enableHdr,
jint hevcBitratePercentageMultiplier, jint hevcBitratePercentageMultiplier,
jint clientRefreshRateX100,
jbyteArray riAesKey, jbyteArray riAesIv, jbyteArray riAesKey, jbyteArray riAesIv,
jint videoCapabilities) { jint videoCapabilities) {
SERVER_INFORMATION serverInfo = { SERVER_INFORMATION serverInfo = {
@ -423,6 +424,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jobject
.supportsHevc = supportsHevc, .supportsHevc = supportsHevc,
.enableHdr = enableHdr, .enableHdr = enableHdr,
.hevcBitratePercentageMultiplier = hevcBitratePercentageMultiplier, .hevcBitratePercentageMultiplier = hevcBitratePercentageMultiplier,
.clientRefreshRateX100 = clientRefreshRateX100
}; };
jbyte* riAesKeyBuf = (*env)->GetByteArrayElements(env, riAesKey, NULL); jbyte* riAesKeyBuf = (*env)->GetByteArrayElements(env, riAesKey, NULL);

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

@ -1 +1 @@
Subproject commit cafc4d8125e32651656f1ed876dd13f1258566e1 Subproject commit bf737dc9595dd478a6d9b327b4045ce26517377d