Merge branch 'master' into dev/abl支持

648540858

2024-03-21 f96250ef45af8d4c8f52fed382da058ab9330bbf

 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;
    }

}