优化拉流代理国标级联点播

648540858

2024-06-20 45410d8091d0ffbb7bc7ef1247847ad2edff275e

优化拉流代理国标级联点播

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -623,7 +623,8 @@
                                String ssrc = "Play".equalsIgnoreCase(sessionName) ? ssrcFactory.getPlaySsrc(mediaServerItem.getId()) : ssrcFactory.getPlayBackSsrc(mediaServerItem.getId());
                                sendRtpItem.setSsrc(ssrc);
                            }
                            if (proxyByAppAndStream.isStatus()) {
                            MediaInfo mediaInfo = redisCatchStorage.getProxyStream(gbStream.getApp(), gbStream.getStream());
                            if (mediaInfo != null) {
                                sendProxyStream(sendRtpItem, mediaServerItem, platform, request);
                            } else {
                                //开启代理拉流

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java

@@ -114,6 +114,7 @@
                    device.setIp(remoteAddressInfo.getIp());
                    device.setPort(remoteAddressInfo.getPort());
                    device.setHostAddress(remoteAddressInfo.getIp().concat(":").concat(String.valueOf(remoteAddressInfo.getPort())));

                    device.setLocalIp(request.getLocalAddress().getHostAddress());
                    Response registerOkResponse = getRegisterOkResponse(request);
                    // 判断TCP还是UDP

 src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java

@@ -135,6 +135,8 @@

    MediaInfo getStreamInfo(String app, String streamId, String mediaServerId);

    MediaInfo getProxyStream(String app, String streamId);

    void addCpuInfo(double cpuInfo);

    void addMemInfo(double memInfo);

 src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java

@@ -497,6 +497,20 @@
    }

    @Override
    public MediaInfo getProxyStream(String app, String streamId) {
        String scanKey = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX  + userSetting.getServerId() + "_PULL_" + app + "_" + streamId + "_*";

        MediaInfo result = null;
        List<Object> keys = RedisUtil.scan(redisTemplate, scanKey);
        if (keys.size() > 0) {
            String key = (String) keys.get(0);
            result = JsonUtil.redisJsonToObject(redisTemplate, key, MediaInfo.class);
        }

        return result;
    }

    @Override
    public void addCpuInfo(double cpuInfo) {
        String key = VideoManagerConstants.SYSTEM_INFO_CPU_PREFIX + userSetting.getServerId();
        Map<String, String> infoMap = new HashMap<>();