合并271分支

648540858

2024-05-24 de6baa157edf398262ca7babbf68e325d3021041

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

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

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

/**
 * 记录每次发送invite消息的状态
@@ -29,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();
@@ -124,40 +123,5 @@
    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;
    }

    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====================*/



}