Merge branch 'refs/heads/2.7.1'

648540858

2024-06-25 57a230afb3b02cedf8ec39cd60e5163f953e3260

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

@@ -87,6 +87,9 @@
    @Schema(description = "产生源类型，包括 unknown = 0,rtmp_push=1,rtsp_push=2,rtp_push=3,pull=4,ffmpeg_pull=5,mp4_vod=6,device_chn=7")
    private int originType;

    @Schema(description = "转码后的视频流")
    private StreamInfo transcodeStream;

    public void setFlv(StreamURL flv) {
        this.flv = flv;
    }
@@ -533,6 +536,14 @@
        this.transactionInfo = transactionInfo;
    }

    public StreamInfo getTranscodeStream() {
        return transcodeStream;
    }

    public void setTranscodeStream(StreamInfo transcodeStream) {
        this.transcodeStream = transcodeStream;
    }

    @Override
    public StreamInfo clone() {
        StreamInfo instance = null;