Merge branch 'master' into dev/zlm

648540858

2024-04-09 b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347

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

@@ -28,7 +28,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();
@@ -123,4 +123,5 @@
    public void setStreamMode(String streamMode) {
        this.streamMode = streamMode;
    }

}