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

Update moonlight-common-c to remove per-codec bitrate adjustments

Browse Source
This commit is contained in:
Cameron Gutman 2023-12-03 22:20:30 -06:00
parent 5443cc014a
commit a18aa26985
6 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/limelight/Game.java
View File

@ -474,8 +474,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
.enableLocalAudioPlayback(prefConfig.playHostAudio) .enableLocalAudioPlayback(prefConfig.playHostAudio)
.setMaxPacketSize(1392) .setMaxPacketSize(1392)
.setRemoteConfiguration(StreamConfiguration.STREAM_CFG_AUTO) // NvConnection will perform LAN and VPN detection .setRemoteConfiguration(StreamConfiguration.STREAM_CFG_AUTO) // NvConnection will perform LAN and VPN detection
.setHevcBitratePercentageMultiplier(75)
.setAv1BitratePercentageMultiplier(75)
.setSupportedVideoFormats(supportedVideoFormats) .setSupportedVideoFormats(supportedVideoFormats)
.setAttachedGamepadMask(gamepadMask) .setAttachedGamepadMask(gamepadMask)
.setClientRefreshRateX100((int)(displayRefreshRate * 100)) .setClientRefreshRateX100((int)(displayRefreshRate * 100))

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

@ -433,8 +433,6 @@ public class NvConnection {
context.negotiatedPacketSize, context.negotiatedRemoteStreaming, context.negotiatedPacketSize, context.negotiatedRemoteStreaming,
context.streamConfig.getAudioConfiguration().toInt(), context.streamConfig.getAudioConfiguration().toInt(),
context.streamConfig.getSupportedVideoFormats(), context.streamConfig.getSupportedVideoFormats(),
context.streamConfig.getHevcBitratePercentageMultiplier(),
context.streamConfig.getAv1BitratePercentageMultiplier(),
context.streamConfig.getClientRefreshRateX100(), context.streamConfig.getClientRefreshRateX100(),
context.streamConfig.getEncryptionFlags(), context.streamConfig.getEncryptionFlags(),
context.riKey.getEncoded(), ib.array(), context.riKey.getEncoded(), ib.array(),

20
app/src/main/java/com/limelight/nvstream/StreamConfiguration.java
View File

@ -23,8 +23,6 @@ public class StreamConfiguration {
private int remote; private int remote;
private MoonBridge.AudioConfiguration audioConfiguration; private MoonBridge.AudioConfiguration audioConfiguration;
private int supportedVideoFormats; private int supportedVideoFormats;
private int hevcBitratePercentageMultiplier;
private int av1BitratePercentageMultiplier;
private int attachedGamepadMask; private int attachedGamepadMask;
private int encryptionFlags; private int encryptionFlags;
private int colorRange; private int colorRange;
@ -85,16 +83,6 @@ public class StreamConfiguration {
return this; return this;
} }
public StreamConfiguration.Builder setHevcBitratePercentageMultiplier(int multiplier) {
config.hevcBitratePercentageMultiplier = multiplier;
return this;
}
public StreamConfiguration.Builder setAv1BitratePercentageMultiplier(int multiplier) {
config.av1BitratePercentageMultiplier = multiplier;
return this;
}
public StreamConfiguration.Builder setAttachedGamepadMask(int attachedGamepadMask) { public StreamConfiguration.Builder setAttachedGamepadMask(int attachedGamepadMask) {
config.attachedGamepadMask = attachedGamepadMask; config.attachedGamepadMask = attachedGamepadMask;
return this; return this;
@ -224,14 +212,6 @@ public class StreamConfiguration {
return supportedVideoFormats; return supportedVideoFormats;
} }
public int getHevcBitratePercentageMultiplier() {
return hevcBitratePercentageMultiplier;
}
public int getAv1BitratePercentageMultiplier() {
return av1BitratePercentageMultiplier;
}
public int getAttachedGamepadMask() { public int getAttachedGamepadMask() {
return attachedGamepadMask; return attachedGamepadMask;
} }

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

@ -347,8 +347,6 @@ public class MoonBridge {
int width, int height, int fps, int width, int height, int fps,
int bitrate, int packetSize, int streamingRemotely, int bitrate, int packetSize, int streamingRemotely,
int audioConfiguration, int supportedVideoFormats, int audioConfiguration, int supportedVideoFormats,
int hevcBitratePercentageMultiplier,
int av1BitratePercentageMultiplier,
int clientRefreshRateX100, int clientRefreshRateX100,
int encryptionFlags, int encryptionFlags,
byte[] riAesKey, byte[] riAesIv, byte[] riAesKey, byte[] riAesIv,

4
app/src/main/jni/moonlight-core/callbacks.c
View File

@ -433,8 +433,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c
jint width, jint height, jint fps, jint width, jint height, jint fps,
jint bitrate, jint packetSize, jint streamingRemotely, jint bitrate, jint packetSize, jint streamingRemotely,
jint audioConfiguration, jint supportedVideoFormats, jint audioConfiguration, jint supportedVideoFormats,
jint hevcBitratePercentageMultiplier,
jint av1BitratePercentageMultiplier,
jint clientRefreshRateX100, jint clientRefreshRateX100,
jint encryptionFlags, jint encryptionFlags,
jbyteArray riAesKey, jbyteArray riAesIv, jbyteArray riAesKey, jbyteArray riAesIv,
@ -456,8 +454,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c
.streamingRemotely = streamingRemotely, .streamingRemotely = streamingRemotely,
.audioConfiguration = audioConfiguration, .audioConfiguration = audioConfiguration,
.supportedVideoFormats = supportedVideoFormats, .supportedVideoFormats = supportedVideoFormats,
.hevcBitratePercentageMultiplier = hevcBitratePercentageMultiplier,
.av1BitratePercentageMultiplier = av1BitratePercentageMultiplier,
.clientRefreshRateX100 = clientRefreshRateX100, .clientRefreshRateX100 = clientRefreshRateX100,
.encryptionFlags = encryptionFlags, .encryptionFlags = encryptionFlags,
.colorSpace = colorSpace, .colorSpace = colorSpace,

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

@ -1 +1 @@
Subproject commit 5de4a5b85a28d8d639482a1a105c3a06eb67a2fd Subproject commit 3ed3ba62534ce06c1b97fec46722969e7710fee6