优化zlm状态管理

648540858

2024-03-20 5e3073005d286ba7fe9dfced7f4a7a26e5452ebb

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

@@ -7,6 +7,10 @@
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;

import com.genersoft.iot.vmp.gb28181.SipLayer;

import com.genersoft.iot.vmp.gb28181.bean.*;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;

import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;

import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;

import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;

import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;

@@ -21,7 +25,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForStreamPush;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

import com.genersoft.iot.vmp.media.zlm.dto.hook.HookParam;

import com.genersoft.iot.vmp.service.IMediaServerService;

import com.genersoft.iot.vmp.media.service.IMediaServerService;

import com.genersoft.iot.vmp.service.bean.SSRCInfo;

import com.genersoft.iot.vmp.utils.DateUtil;

import gov.nist.javax.sip.message.SIPRequest;

@@ -40,7 +44,6 @@
import javax.sip.header.CallIdHeader;

import javax.sip.message.Request;

import java.text.ParseException;

import java.util.ArrayList;

import java.util.List;



/**

@@ -266,12 +269,12 @@
     * 请求预览视频流

     *

     * @param device     视频设备

     * @param channelId  预览通道

     * @param channel  预览通道

     * @param event      hook订阅

     * @param errorEvent sip错误订阅

     */

    @Override

    public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,

    public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, DeviceChannel channel,

                              ZlmHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

        String stream = ssrcInfo.getStream();



@@ -295,7 +298,7 @@
        }

        StringBuffer content = new StringBuffer(200);

        content.append("v=0\r\n");

        content.append("o=" + channelId + " 0 0 IN IP4 " + sdpIp + "\r\n");

        content.append("o=" + channel.getChannelId() + " 0 0 IN IP4 " + sdpIp + "\r\n");

        content.append("s=Play\r\n");

        content.append("c=IN IP4 " + sdpIp + "\r\n");

        content.append("t=0 0\r\n");

@@ -346,20 +349,8 @@
            }

        }



        if( device.isSwitchPrimarySubStream() ){

            if("TP-LINK".equals(device.getManufacturer())){

                if (device.isSwitchPrimarySubStream()){

                    content.append("a=streamMode:sub\r\n");

                }else {

                    content.append("a=streamMode:main\r\n");

                }

            }else {

                if (device.isSwitchPrimarySubStream()){

                    content.append("a=streamprofile:1\r\n");

                }else {

                    content.append("a=streamprofile:0\r\n");

                }

            }

        if (!ObjectUtils.isEmpty(channel.getStreamIdentification())) {

            content.append("a=" + channel.getStreamIdentification() + "\r\n");

        }



        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc

@@ -368,16 +359,16 @@






        Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(),sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        Request request = headerProvider.createInviteRequest(device, channel.getChannelId(), content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(),sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, (e -> {

            streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());

            streamSession.remove(device.getDeviceId(), channel.getChannelId(), ssrcInfo.getStream());

            mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());

            errorEvent.response(e);

        }), e -> {

            ResponseEvent responseEvent = (ResponseEvent) e.event;

            SIPResponse response = (SIPResponse) responseEvent.getResponse();

            String callId = response.getCallIdHeader().getCallId();

            streamSession.put(device.getDeviceId(), channelId, callId, stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response,

            streamSession.put(device.getDeviceId(), channel.getChannelId(), callId, stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response,

                    InviteSessionType.PLAY);

            okEvent.response(e);

        });