648540858
2023-06-25 66eda32ab97d6e94e9f274d6faa4df586c452dfb
优化端口预占用
2个文件已修改
27 ■■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -228,7 +228,7 @@
        int localPort = 0;
        if (userSetting.getGbSendStreamStrict()) {
            if (userSetting.getGbSendStreamStrict()) {
                localPort = keepPort(serverItem, ssrc);
                localPort = keepPort(serverItem, ssrc, null);
                if (localPort == 0) {
                    return null;
                }
@@ -264,7 +264,7 @@
        // 默认为随机端口
        int localPort = 0;
        if (userSetting.getGbSendStreamStrict()) {
            localPort = keepPort(serverItem, ssrc);
            localPort = keepPort(serverItem, ssrc, null);
            if (localPort == 0) {
                return null;
            }
@@ -288,23 +288,28 @@
    /**
     * 保持端口,直到需要需要发流时再释放
     */
    public int keepPort(MediaServerItem serverItem, String ssrc) {
        int localPort = 0;
    public int keepPort(MediaServerItem serverItem, String ssrc, Integer localPort) {
        Map<String, Object> param = new HashMap<>(3);
        param.put("port", 0);
        if (localPort == null) {
            localPort = 0;
        }
        param.put("port", localPort);
        param.put("enable_tcp", 1);
        param.put("stream_id", ssrc);
        JSONObject jsonObject = zlmresTfulUtils.openRtpServer(serverItem, param);
        if (jsonObject.getInteger("code") == 0) {
            localPort = jsonObject.getInteger("port");
            HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(ssrc, null, serverItem.getId());
            Integer finalLocalPort = localPort;
            hookSubscribe.addSubscribe(hookSubscribeForRtpServerTimeout,
                    (MediaServerItem mediaServerItem, JSONObject response)->{
                        logger.info("[上级点播] {}->监听端口到期继续保持监听", ssrc);
                        int port = keepPort(serverItem, ssrc);
                        if (port == 0) {
                            logger.info("[上级点播] {}->监听端口失败,移除监听", ssrc);
                            hookSubscribe.removeSubscribe(hookSubscribeForRtpServerTimeout);
                        if (ssrc.equals(response.getString("ssrc"))) {
                            logger.info("[上级点播] {}->监听端口到期继续保持监听", ssrc);
                            int port = keepPort(serverItem, ssrc, finalLocalPort);
                            if (port == 0) {
                                logger.info("[上级点播] {}->监听端口失败,移除监听", ssrc);
                                hookSubscribe.removeSubscribe(hookSubscribeForRtpServerTimeout);
                            }
                        }
                    });
        logger.info("[保持端口] {}->监听端口: {}", ssrc, localPort);
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -235,7 +235,7 @@
        sendRtpItem.setReceiveStream(stream + "_talk");
        int port = zlmrtpServerFactory.keepPort(mediaServerItem, playSsrc);
        int port = zlmrtpServerFactory.keepPort(mediaServerItem, playSsrc, null);
        //端口获取失败的ssrcInfo 没有必要发送点播指令
        if (port <= 0) {
            logger.info("[语音对讲] 端口分配异常,deviceId={},channelId={}", device.getDeviceId(), channelId);