优化语音对讲级联，目前等待zlm支持openRTPServer仅收音频

648540858

2023-02-14 d5f26faf15ec2b9fbbd5225d86297364b48876b7

优化语音对讲级联，目前等待zlm支持openRTPServer仅收音频

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java

@@ -310,24 +310,24 @@
        return request;
    }

    public Request createInviteRequest(ParentPlatform platform, String channelId, String toString, String viaTag, String fromTag, Object content, String ssrc, CallIdHeader callIdHeader, String transport) throws PeerUnavailableException, ParseException, InvalidArgumentException {
    public Request createInviteRequest(ParentPlatform platform, String channelId, String content, String viaTag, String fromTag, String ssrc, CallIdHeader callIdHeader) throws PeerUnavailableException, ParseException, InvalidArgumentException {
        Request request = null;
        //请求行
        String deviceHostAddress = platform.getDeviceIp() + ":" + platform.getDevicePort();
        SipURI requestLine = sipLayer.getSipFactory().createAddressFactory().createSipURI(channelId, deviceHostAddress);
        String platformHostAddress = platform.getServerIP() + ":" + platform.getServerPort();
        String localHostAddress = sipLayer.getLocalIp(platform.getDeviceIp())+":"+ platform.getDevicePort();
        SipURI requestLine = sipLayer.getSipFactory().createAddressFactory().createSipURI(channelId, platformHostAddress);
        //via
        ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
        HeaderFactory headerFactory = sipLayer.getSipFactory().createHeaderFactory();
        ViaHeader viaHeader = sipLayer.getSipFactory().createHeaderFactory().createViaHeader(sipLayer.getLocalIp(platform.getDeviceIp()), platform.getDevicePort(), platform.getTransport(), viaTag);
        viaHeader.setRPort();
        viaHeaders.add(viaHeader);

        //from
        SipURI fromSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getDomain());
        SipURI fromSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(platform.getDeviceGBId(), sipConfig.getDomain());
        Address fromAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(fromSipURI);
        FromHeader fromHeader = sipLayer.getSipFactory().createHeaderFactory().createFromHeader(fromAddress, fromTag); //必须要有标记，否则无法创建会话，无法回应ack
        //to
        SipURI toSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(channelId, deviceHostAddress);
        SipURI toSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(channelId, platformHostAddress);
        Address toAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(toSipURI);
        ToHeader toHeader = sipLayer.getSipFactory().createHeaderFactory().createToHeader(toAddress,null);

@@ -340,8 +340,7 @@

        request.addHeader(SipUtils.createUserAgentHeader(sipLayer.getSipFactory(), gitUtil));

        Address concatAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(sipLayer.getSipFactory().createAddressFactory().createSipURI(sipConfig.getId(), sipLayer.getLocalIp(platform.getDeviceIp())+":"+ deviceHostAddress));
        // Address concatAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(sipLayer.getSipFactory().createAddressFactory().createSipURI(sipConfig.getId(), device.getHost().getIp()+":"+device.getHost().getPort()));
        Address concatAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(sipLayer.getSipFactory().createAddressFactory().createSipURI(sipConfig.getId(),localHostAddress));
        request.addHeader(sipLayer.getSipFactory().createHeaderFactory().createContactHeader(concatAddress));
        // Subject
        SubjectHeader subjectHeader = sipLayer.getSipFactory().createHeaderFactory().createSubjectHeader(String.format("%s:%s,%s:%s", channelId, ssrc, sipConfig.getId(), 0));

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java

@@ -728,12 +728,12 @@
        String characterSet = platform.getCharacterSet();
        StringBuffer mediaStatusXml = new StringBuffer(200);
        mediaStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
        mediaStatusXml.append("<Notify>\r\n");
        mediaStatusXml.append("<Response>\r\n");
        mediaStatusXml.append("<CmdType>Broadcast</CmdType>\r\n");
        mediaStatusXml.append("<SN>" + sn + "</SN>\r\n");
        mediaStatusXml.append("<DeviceID>" + deviceChannel.getChannelId() + "</DeviceID>\r\n");
        mediaStatusXml.append("<Result>" + (result?"OK":"ERROR") + "</Result>\r\n");
        mediaStatusXml.append("</Notify>\r\n");
        mediaStatusXml.append("</Response>\r\n");

        CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(platform.getDeviceIp(), platform.getTransport());

@@ -793,8 +793,8 @@
        CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(platform.getDeviceIp()), platform.getTransport());

        Request request = headerProviderPlatformProvider.createInviteRequest(platform, channelId,
                content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(),
                callIdHeader ,platform.getTransport());
                content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(),  ssrcInfo.getSsrc(),
                callIdHeader);
        sipSender.transmitRequest(sipLayer.getLocalIp(platform.getDeviceIp()), request, (e -> {
            streamSession.remove(platform.getServerGBId(), channelId, ssrcInfo.getStream());
            mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -332,49 +332,34 @@
                }

            }else if ("broadcast".equals(param.getApp())){

                // 语音对讲推流  stream需要满足格式deviceId_channelId

                if (param.isRegist() && param.getStream().indexOf("_") > 0) {

                    String[] streamArray = param.getStream().split("_");

                    if (streamArray.length == 2) {

                        String deviceId = streamArray[0];

                        String channelId = streamArray[1];

                        Device device = deviceService.getDevice(deviceId);

                        if (device != null) {

                            if (param.isRegist()) {

                                if (audioBroadcastManager.exit(deviceId, channelId)) {

                                    // 直接推流

                                    SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(null, null, param.getStream(), null);

                                    if (sendRtpItem == null) {

                                        // TODO 可能数据错误，重新开启语音通道

                                    }else {

                                        JSONObject jsonObject = zlmrtpServerFactory.startSendRtp(mediaInfo, sendRtpItem);

                                        if (jsonObject != null && jsonObject.getInteger("code") == 0 ) {

                                            logger.info("[语音喊话] 自动推流成功, device: {}, channel: {}", device.getDeviceId(), channelId);

                                        }else {

                                            logger.info("[语音喊话] 推流失败, 结果： {}", jsonObject);

                                        }



                                    }

                                }else {

                                    // 开启语音喊话通道

                                    try {

                                        playService.audioBroadcastCmd(device, channelId, mediaInfo, param.getApp(), param.getStream(),60, false, (msg)->{

                                            logger.info("[语音喊话] 通道建立成功, device: {}, channel: {}", deviceId, channelId);

                                        });

                                    } catch (InvalidArgumentException | ParseException | SipException e) {

                                        logger.error("[命令发送失败] 语音喊话: {}", e.getMessage());

                                    }

                                }

                            }else {

                                // 流注销

                                playService.stopAudioBroadcast(deviceId, channelId);

                            }

                        } else{

                            logger.info("[语音对讲] 未找到设备：{}", deviceId);

                        }

                    }else {

                        logger.info("[语音喊话] 推流格式有误, 格式为： broadcast/设备编号_通道编号 ");

                    }

                }

                if (param.getStream().indexOf("_") > 0) {

                    String[] streamArray = param.getStream().split("_");

                    if (streamArray.length == 2) {

                        String deviceId = streamArray[0];

                        String channelId = streamArray[1];

                        Device device = deviceService.getDevice(deviceId);

                        if (device != null) {

                            if (param.isRegist()) {

                                if (audioBroadcastManager.exit(deviceId, channelId)) {

                                    playService.stopAudioBroadcast(deviceId, channelId);

                                }

                                // 开启语音对讲通道

                                try {

                                    playService.audioBroadcastCmd(device, channelId, mediaInfo, param.getApp(), param.getStream(), 60, false, (msg)->{

                                        logger.info("[语音对讲] 通道建立成功, device: {}, channel: {}", deviceId, channelId);

                                    });

                                } catch (InvalidArgumentException | ParseException | SipException e) {

                                    logger.error("[命令发送失败] 语音对讲: {}", e.getMessage());

                                }

                            }else {

                                // 流注销

                                playService.stopAudioBroadcast(deviceId, channelId);

                            }

                        } else{

                            logger.info("[语音对讲] 未找到设备：{}", deviceId);

                        }

                    }

                }

            }else if ("talk".equals(param.getApp())){

                // 语音喊话推流  stream需要满足格式deviceId_channelId

                if (param.isRegist() && param.getStream().indexOf("_") > 0) {