From a18aa2698513ae5b7b585e68ffc49fb1f23ad955 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 3 Dec 2023 22:20:30 -0600 Subject: [PATCH] Update moonlight-common-c to remove per-codec bitrate adjustments --- app/src/main/java/com/limelight/Game.java | 2 -- .../com/limelight/nvstream/NvConnection.java | 2 -- .../nvstream/StreamConfiguration.java | 20 ------------------- .../limelight/nvstream/jni/MoonBridge.java | 2 -- app/src/main/jni/moonlight-core/callbacks.c | 4 ---- .../jni/moonlight-core/moonlight-common-c | 2 +- 6 files changed, 1 insertion(+), 31 deletions(-) diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java index 232b6474..bdd9548a 100644 --- a/app/src/main/java/com/limelight/Game.java +++ b/app/src/main/java/com/limelight/Game.java @@ -474,8 +474,6 @@ public class Game extends Activity implements SurfaceHolder.Callback, .enableLocalAudioPlayback(prefConfig.playHostAudio) .setMaxPacketSize(1392) .setRemoteConfiguration(StreamConfiguration.STREAM_CFG_AUTO) // NvConnection will perform LAN and VPN detection - .setHevcBitratePercentageMultiplier(75) - .setAv1BitratePercentageMultiplier(75) .setSupportedVideoFormats(supportedVideoFormats) .setAttachedGamepadMask(gamepadMask) .setClientRefreshRateX100((int)(displayRefreshRate * 100)) diff --git a/app/src/main/java/com/limelight/nvstream/NvConnection.java b/app/src/main/java/com/limelight/nvstream/NvConnection.java index 7fd24f47..0969cc4c 100644 --- a/app/src/main/java/com/limelight/nvstream/NvConnection.java +++ b/app/src/main/java/com/limelight/nvstream/NvConnection.java @@ -433,8 +433,6 @@ public class NvConnection { context.negotiatedPacketSize, context.negotiatedRemoteStreaming, context.streamConfig.getAudioConfiguration().toInt(), context.streamConfig.getSupportedVideoFormats(), - context.streamConfig.getHevcBitratePercentageMultiplier(), - context.streamConfig.getAv1BitratePercentageMultiplier(), context.streamConfig.getClientRefreshRateX100(), context.streamConfig.getEncryptionFlags(), context.riKey.getEncoded(), ib.array(), diff --git a/app/src/main/java/com/limelight/nvstream/StreamConfiguration.java b/app/src/main/java/com/limelight/nvstream/StreamConfiguration.java index fd462e29..ccd5c869 100644 --- a/app/src/main/java/com/limelight/nvstream/StreamConfiguration.java +++ b/app/src/main/java/com/limelight/nvstream/StreamConfiguration.java @@ -23,8 +23,6 @@ public class StreamConfiguration { private int remote; private MoonBridge.AudioConfiguration audioConfiguration; private int supportedVideoFormats; - private int hevcBitratePercentageMultiplier; - private int av1BitratePercentageMultiplier; private int attachedGamepadMask; private int encryptionFlags; private int colorRange; @@ -85,16 +83,6 @@ public class StreamConfiguration { 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) { config.attachedGamepadMask = attachedGamepadMask; return this; @@ -224,14 +212,6 @@ public class StreamConfiguration { return supportedVideoFormats; } - public int getHevcBitratePercentageMultiplier() { - return hevcBitratePercentageMultiplier; - } - - public int getAv1BitratePercentageMultiplier() { - return av1BitratePercentageMultiplier; - } - public int getAttachedGamepadMask() { return attachedGamepadMask; } diff --git a/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java b/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java index 4e932f49..9d54b4dd 100644 --- a/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java +++ b/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java @@ -347,8 +347,6 @@ public class MoonBridge { int width, int height, int fps, int bitrate, int packetSize, int streamingRemotely, int audioConfiguration, int supportedVideoFormats, - int hevcBitratePercentageMultiplier, - int av1BitratePercentageMultiplier, int clientRefreshRateX100, int encryptionFlags, byte[] riAesKey, byte[] riAesIv, diff --git a/app/src/main/jni/moonlight-core/callbacks.c b/app/src/main/jni/moonlight-core/callbacks.c index ce058ee8..c1ccfbaa 100644 --- a/app/src/main/jni/moonlight-core/callbacks.c +++ b/app/src/main/jni/moonlight-core/callbacks.c @@ -433,8 +433,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c jint width, jint height, jint fps, jint bitrate, jint packetSize, jint streamingRemotely, jint audioConfiguration, jint supportedVideoFormats, - jint hevcBitratePercentageMultiplier, - jint av1BitratePercentageMultiplier, jint clientRefreshRateX100, jint encryptionFlags, jbyteArray riAesKey, jbyteArray riAesIv, @@ -456,8 +454,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c .streamingRemotely = streamingRemotely, .audioConfiguration = audioConfiguration, .supportedVideoFormats = supportedVideoFormats, - .hevcBitratePercentageMultiplier = hevcBitratePercentageMultiplier, - .av1BitratePercentageMultiplier = av1BitratePercentageMultiplier, .clientRefreshRateX100 = clientRefreshRateX100, .encryptionFlags = encryptionFlags, .colorSpace = colorSpace, diff --git a/app/src/main/jni/moonlight-core/moonlight-common-c b/app/src/main/jni/moonlight-core/moonlight-common-c index 5de4a5b8..3ed3ba62 160000 --- a/app/src/main/jni/moonlight-core/moonlight-common-c +++ b/app/src/main/jni/moonlight-core/moonlight-common-c @@ -1 +1 @@ -Subproject commit 5de4a5b85a28d8d639482a1a105c3a06eb67a2fd +Subproject commit 3ed3ba62534ce06c1b97fec46722969e7710fee6