调整转码后的流的输出位置

648540858

2024-06-14 f3ea07bdcd722d667e16b7a880f41a30b9374732

调整转码后的流的输出位置

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

@@ -83,6 +83,9 @@
    @Schema(description = "是否暂停（录像回放使用）")
    private boolean pause;

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

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

    public StreamInfo getTranscodeStream() {
        return transcodeStream;
    }

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

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

 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java

@@ -95,10 +95,6 @@
        if (addr == null) {
            addr = mediaInfo.getStreamIp();
        }
        if (!"broadcast".equalsIgnoreCase(app) && !ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix()) && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())) {
            stream = stream + "_" + mediaInfo.getTranscodeSuffix();
//            streamInfoResult.setStream(stream);
        }

        streamInfoResult.setIp(addr);
        streamInfoResult.setMediaServerId(mediaInfo.getId());
@@ -112,6 +108,14 @@
        streamInfoResult.setRtc(addr, mediaInfo.getHttpPort(),mediaInfo.getHttpSSlPort(), app,  stream, callIdParam, isPlay);

        streamInfoResult.setTracks(tracks);

        if (!"broadcast".equalsIgnoreCase(app) && !ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix()) && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())) {
            String newStream = stream + "_" + mediaInfo.getTranscodeSuffix();
            mediaInfo.setTranscodeSuffix(null);
            StreamInfo transcodeStreamInfo = getStreamInfoByAppAndStream(mediaInfo, app, newStream, tracks, addr, callId, isPlay);
            streamInfoResult.setTranscodeStream(transcodeStreamInfo);
        }

        return streamInfoResult;
    }
}

 src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java

@@ -97,6 +97,9 @@
    @Schema(description = "文件下载地址（录像下载使用）")
    private DownloadFileInfo downLoadFilePath;

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

    private double progress;

    public StreamContent(StreamInfo streamInfo) {
@@ -178,6 +181,17 @@
        if (streamInfo.getDownLoadFilePath() != null) {
            this.downLoadFilePath = streamInfo.getDownLoadFilePath();
        }
        if (streamInfo.getTranscodeStream() != null) {
            this.transcodeStream = new StreamContent(streamInfo.getTranscodeStream());
        }
    }

    public StreamContent getTranscodeStream() {
        return transcodeStream;
    }

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

    public String getApp() {

 src/main/resources/application.yml

@@ -2,4 +2,4 @@
  application:
    name: wvp
  profiles:
    active: local
    active: local271