Merge branch 'wvp-28181-2.0' into feature/record

648540858

2023-12-18 67d1ff0d263f8179ca24d875f39b9186268d3dfa

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

@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.common;

import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import io.swagger.v3.oas.annotations.media.Schema;

/**
 * 记录每次发送invite消息的状态
@@ -28,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();
@@ -123,4 +124,21 @@
    public void setStreamMode(String streamMode) {
        this.streamMode = streamMode;
    }


    /*=========================设备主子码流逻辑START====================*/
    @Schema(description = "是否为子码流(true-是，false-主码流)")
    private boolean subStream;

    public boolean isSubStream() {
        return subStream;
    }

    public void setSubStream(boolean subStream) {
        this.subStream = subStream;
    }




}