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

648540858

2024-06-14 f3ea07bdcd722d667e16b7a880f41a30b9374732

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