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

Fix use of negotiated stream parameters

Browse Source
This commit is contained in:
Cameron Gutman 2017-05-15 21:37:26 -07:00
parent 67469103d4
commit 203fcd82e7
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,6 @@ public class ConnectionContext {
public String serverAppVersion; public String serverAppVersion;
public String serverGfeVersion; public String serverGfeVersion;
public int negotiatedVideoFormat;
public int negotiatedWidth, negotiatedHeight; public int negotiatedWidth, negotiatedHeight;
public int negotiatedFps; public int negotiatedFps;
} }

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

@ -47,8 +47,6 @@ public class NvConnection {
} }
this.context.riKeyId = generateRiKeyId(); this.context.riKeyId = generateRiKeyId();
this.context.negotiatedVideoFormat = -1;
} }
private static SecretKey generateRiAesKey() throws NoSuchAlgorithmException { private static SecretKey generateRiAesKey() throws NoSuchAlgorithmException {
@ -229,8 +227,8 @@ public class NvConnection {
MoonBridge.startConnection(context.serverAddress.getHostAddress(), MoonBridge.startConnection(context.serverAddress.getHostAddress(),
context.serverAppVersion, context.serverGfeVersion, context.serverAppVersion, context.serverGfeVersion,
context.streamConfig.getWidth(), context.streamConfig.getHeight(), context.negotiatedWidth, context.negotiatedHeight,
context.streamConfig.getRefreshRate(), context.streamConfig.getBitrate(), context.negotiatedFps, context.streamConfig.getBitrate(),
context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration(), context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration(),
context.streamConfig.getHevcSupported(), context.riKey.getEncoded(), ib.array()); context.streamConfig.getHevcSupported(), context.riKey.getEncoded(), ib.array());
} }
@ -293,8 +291,4 @@ public class NvConnection {
public void sendMouseScroll(final byte scrollClicks) { public void sendMouseScroll(final byte scrollClicks) {
MoonBridge.sendMouseScroll(scrollClicks); MoonBridge.sendMouseScroll(scrollClicks);
} }
public int getActiveVideoFormat() {
return context.negotiatedVideoFormat;
}
} }