Merge pull request #1102 from xu-bin-bin/wvp-28181-2.0

648540858

2023-10-27 af911d4f02426d6541eaa7abf8a850efb7cd1baf

 src/main/java/com/genersoft/iot/vmp/common/InviteInfo.java

@@ -29,7 +29,7 @@
    private StreamInfo streamInfo;


    public static InviteInfo getinviteInfo(String deviceId, String channelId, String stream, SSRCInfo ssrcInfo,
    public static InviteInfo getInviteInfo(String deviceId, String channelId, String stream, SSRCInfo ssrcInfo,
                                           String receiveIp, Integer receivePort, String streamMode,
                                           InviteSessionType type, InviteSessionStatus status) {
        InviteInfo inviteInfo = new InviteInfo();
@@ -138,25 +138,6 @@
        this.subStream = subStream;
    }

    public static InviteInfo getInviteInfo(String deviceId, String channelId,Boolean isSubStream, String stream, SSRCInfo ssrcInfo,
                                           String receiveIp, Integer receivePort, String streamMode,
                                           InviteSessionType type, InviteSessionStatus status) {
        InviteInfo inviteInfo = new InviteInfo();
        inviteInfo.setDeviceId(deviceId);
        inviteInfo.setChannelId(channelId);
        inviteInfo.setStream(stream);
        inviteInfo.setSsrcInfo(ssrcInfo);
        inviteInfo.setReceiveIp(receiveIp);
        inviteInfo.setReceivePort(receivePort);
        inviteInfo.setStreamMode(streamMode);
        inviteInfo.setType(type);
        inviteInfo.setStatus(status);
        if(isSubStream != null){
            inviteInfo.setSubStream(isSubStream);
        }
        return inviteInfo;
    }
    /*=========================设备主子码流逻辑END====================*/