Browse Source

取消了2019协议的前缀

kwl 1 tuần trước cách đây
mục cha
commit
b64bce7b41

+ 2 - 4
src/main/java/com/jttserver/Server.java

@@ -52,8 +52,6 @@ public class Server {
 
         String prefixRetime = com.jttserver.config.ConfigManager.get("server.realtime.prefix", "/realtime/");
         String prefixPlayback = com.jttserver.config.ConfigManager.get("server.playback.prefix", "/playback/");
-        String prefixRetime2019 = com.jttserver.config.ConfigManager.get("server.realtime2019.prefix", "/realtime2019/");
-        String prefixPlayback2019 = com.jttserver.config.ConfigManager.get("server.playback2019.prefix", "/playback2019/");
 
 
         PublishServer wsServer = new WebsockServer(wsPort);
@@ -65,8 +63,8 @@ public class Server {
             RecvSever readTimeServer = new JttVideoRecvServer(wsServer, realtimePort, prefixRetime, StreamRelayType.FLV_REALTIME);
             RecvSever playbackServer = new JttVideoRecvServer(wsServer, playbackPort, prefixPlayback, StreamRelayType.FLV_PLAYBACK);
 
-            RecvSever readTimeServer2019 = new JttVideoRecvServer(wsServer, realtimePort2019, prefixRetime2019, StreamRelayType.FLV_REALTIME, JttConstants.TYPE_JTT808_2019);
-            RecvSever playbackServer2019 = new JttVideoRecvServer(wsServer, playbackPort2019, prefixPlayback2019, StreamRelayType.FLV_PLAYBACK, JttConstants.TYPE_JTT808_2019);
+            RecvSever readTimeServer2019 = new JttVideoRecvServer(wsServer, realtimePort2019, prefixRetime, StreamRelayType.FLV_REALTIME, JttConstants.TYPE_JTT808_2019);
+            RecvSever playbackServer2019 = new JttVideoRecvServer(wsServer, playbackPort2019, prefixPlayback, StreamRelayType.FLV_PLAYBACK, JttConstants.TYPE_JTT808_2019);
 
 
             // 当程序正常退出时自动调用stop()方法来关闭服务器。

+ 1 - 1
src/main/java/com/jttserver/codec/FlvPacketizer.java

@@ -60,7 +60,7 @@ public class FlvPacketizer {
     private static final byte NALU_TYPE_H265_IDR_N_LP = 20; // IDR_N_LP
 
     // 存储每个channel的编解码器信息
-    private final Map<String, CodecInfo> channelCodecInfo = new ConcurrentHashMap<>();
+    private static final Map<String, CodecInfo> channelCodecInfo = new ConcurrentHashMap<>();
 
     /**
      * 编解码器信息