From af04831fb06a45bdefcb1ac6bfcb072d88b95a75 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 26 May 2017 22:44:15 -0700
Subject: [PATCH] Plumb the specified packet size through to moonlight-common-c

---
 .../src/main/java/com/limelight/nvstream/NvConnection.java     | 1 +
 .../src/main/java/com/limelight/nvstream/jni/MoonBridge.java   | 2 +-
 moonlight-common/src/main/jni/moonlight-core/callbacks.c       | 3 ++-
 .../src/main/jni/moonlight-core/moonlight-common-c             | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java b/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
index 5eb26d40..53159c21 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
@@ -253,6 +253,7 @@ public class NvConnection {
 							context.serverAppVersion, context.serverGfeVersion,
 							context.negotiatedWidth, context.negotiatedHeight,
 							context.negotiatedFps, context.streamConfig.getBitrate(),
+							context.streamConfig.getMaxPacketSize(),
 							context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration(),
 							context.streamConfig.getHevcSupported(), context.riKey.getEncoded(), ib.array(),
 							context.videoCapabilities);
diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java b/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
index f49045e7..226e9c07 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
@@ -158,7 +158,7 @@ public class MoonBridge {
 
     public static native int startConnection(String address, String appVersion, String gfeVersion,
                                               int width, int height, int fps,
-                                              int bitrate, boolean streamingRemotely,
+                                              int bitrate, int packetSize, boolean streamingRemotely,
                                               int audioConfiguration, boolean supportsHevc,
                                               byte[] riAesKey, byte[] riAesIv,
                                               int videoCapabilities);
diff --git a/moonlight-common/src/main/jni/moonlight-core/callbacks.c b/moonlight-common/src/main/jni/moonlight-core/callbacks.c
index d83816f7..0bc2c042 100644
--- a/moonlight-common/src/main/jni/moonlight-core/callbacks.c
+++ b/moonlight-common/src/main/jni/moonlight-core/callbacks.c
@@ -369,7 +369,7 @@ JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jobject class,
                                                            jstring address, jstring appVersion, jstring gfeVersion,
                                                            jint width, jint height, jint fps,
-                                                           jint bitrate, jboolean streamingRemotely,
+                                                           jint bitrate, jint packetSize, jboolean streamingRemotely,
                                                            jint audioConfiguration, jboolean supportsHevc,
                                                            jbyteArray riAesKey, jbyteArray riAesIv,
                                                            jint videoCapabilities) {
@@ -383,6 +383,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jobject
             .height = height,
             .fps = fps,
             .bitrate = bitrate,
+            .packetSize = packetSize,
             .streamingRemotely = streamingRemotely,
             .audioConfiguration = audioConfiguration,
             .supportsHevc = supportsHevc,
diff --git a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
index 86447399..6e31c218 160000
--- a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
+++ b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 86447399a97472797a3c7333c36b1f9156c7c101
+Subproject commit 6e31c21815d3800ba1f011e2308102d70207a525