still...

Author: USS-Shenzhou

gradle.properties

@@ -30,7 +30,7 @@ mod_name=Channel
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GNU GPL 3.0
 # The mod version. See https://semver.org/
-mod_version=26.1.2-15+alpha
+mod_version=26.1.2-16+alpha
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/cn/ussshenzhou/channel/audio/client/receive/AudioReceiveHandler.java

@@ -74,6 +74,7 @@ private static void handleInternal(AudioPacket2C packet, Level level) throws Exc
         }
         var earPos = AudioHelper.getEarPos();
         var decoded = OpusManager.decode(packet.opus, packet.from);
+        LogUtils.getLogger().warn("{}",decoded.length);
         if (Minecraft.getInstance().player != null && !Minecraft.getInstance().player.getUUID().equals(packet.from) && earPos.distanceToSqr(x, y, z) <= 64 * 64) {
             // direct talking sound always apply
             var audio = getDirectAudioAndCheckSampleRate(packet.from, 48000);

src/main/java/cn/ussshenzhou/channel/audio/client/send/MicReader.java

@@ -37,7 +37,6 @@ public static void init() {
         slidingWindow = new WebRTCHelper.SimpleSlidingBooleanWindow(ModConstant.VAD_SMOOTH_WINDOW_LENGTH_MS / frameLength);
     }
 
-    @Deprecated
     public static synchronized void frameLengthChange() {
         keepReading.cancel(false);
         frameLength = ChannelClientConfig.get().frameLengthMs;

src/main/java/cn/ussshenzhou/channel/gui/TransmitConfigPanel.java

@@ -1,6 +1,7 @@
 package cn.ussshenzhou.channel.gui;
 
 import cn.ussshenzhou.channel.audio.OpusManager;
+import cn.ussshenzhou.channel.audio.client.send.MicReader;
 import cn.ussshenzhou.channel.config.ChannelClientConfig;
 import cn.ussshenzhou.channel.subspace.client.SubspaceConnection;
 import cn.ussshenzhou.channel.util.ModConstant;
@@ -36,7 +37,10 @@ public TransmitConfigPanel() {
         addOptionCycleButtonInit(
                 Component.translatable("channel.config.net.length"),
                 Stream.concat(ModConstant.USABLE_FRAME_LENGTH.stream(), Stream.of(cfg.frameLengthMs)).distinct().collect(Collectors.toList()),
-                length -> _ -> ChannelClientConfig.write(c -> c.frameLengthMs = length),
+                length -> _ -> {
+                    ChannelClientConfig.write(c -> c.frameLengthMs = length);
+                    MicReader.frameLengthChange();
+                },
                 entry -> entry.getContent() == cfg.frameLengthMs
         ).getB().setTooltip(Tooltip.create(Component.translatable("channel.config.net.length.tooltip")));
         var netSampleRate = addOptionCycleButtonInit(

src/main/java/cn/ussshenzhou/channel/subspace/client/SubspaceConnection.java

@@ -183,6 +183,7 @@ private static void connectTcp(SubspaceInitPacket packet) {
         new Bootstrap()
                 .group(EVENT_LOOP_GROUP)
                 .channel(NioSocketChannel.class)
+                .option(ChannelOption.TCP_NODELAY, true)
                 .handler(new ChannelInitializer<SocketChannel>() {
                     @Override
                     protected void initChannel(SocketChannel ch) {

src/main/java/cn/ussshenzhou/channel/subspace/server/SubspaceConnection.java

@@ -54,6 +54,7 @@ public static void connect() {
         new Bootstrap()
                 .group(EVENT_LOOP_GROUP)
                 .channel(NioSocketChannel.class)
+                .option(ChannelOption.TCP_NODELAY, true)
                 .handler(new ChannelInitializer<SocketChannel>() {
                     @Override
                     protected void initChannel(SocketChannel ch) {

subspace/src/network/ClientTcpConnection.cpp

@@ -46,6 +46,7 @@ namespace subspace {
     }
 
     void ClientTcpConnection::start() {
+        socket.set_option(asio::ip::tcp::no_delay(true));
         remoteAddress = socket.remote_endpoint().address().to_string() + ":" + std::to_string(socket.remote_endpoint().port());
         spdlog::info("Client connecting from {}", getRemoteAddress());
         handshakeTimer.expires_after(std::chrono::seconds(5));

subspace/src/network/ServerConnection.cpp

@@ -9,6 +9,7 @@ namespace subspace {
         BaseConnection(CryptHelper::NULL_ENCODE_DECODE, CryptHelper::AES_GCM_DECODE), socket(std::move(socket)), handshakeTimer(this->socket.get_executor()) {}
 
     void ServerConnection::start() {
+        socket.set_option(asio::ip::tcp::no_delay(true));
         remoteAddress = socket.remote_endpoint().address().to_string() + ":" + std::to_string(socket.remote_endpoint().port());
         spdlog::info("Minecraft Server connecting, from {}", getRemoteAddress());
         handshakeTimer.expires_from_now(std::chrono::seconds(3));