Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化播放地址携带流来源信息参数添加算法

master
lin 2025-03-12 16:18:19 +08:00
parent e5c3f82d54
commit e473ab185d
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
View File

@ -823,20 +823,23 @@ public class MediaServerServiceImpl implements IMediaServerService {
} }
streamInfoResult.setMediaServer(mediaServer); streamInfoResult.setMediaServer(mediaServer);
StringBuilder callIdParamBuilder = new StringBuilder();; Map<String, String> param = new HashMap<>();
if (!ObjectUtils.isEmpty(callId) || (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr()))) {
StringBuilder stringBuilder = new StringBuilder();
if (!ObjectUtils.isEmpty(callId)) { if (!ObjectUtils.isEmpty(callId)) {
stringBuilder.append("callId=").append(callId); param.put("callId", callId);
} }
if (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr())) { if (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr())) {
if (!ObjectUtils.isEmpty(callId)) { param.put("originTypeStr", mediaInfo.getOriginTypeStr());
stringBuilder.append("&");
} }
stringBuilder.append("originTypeStr=").append(mediaInfo.getOriginTypeStr()); StringBuilder callIdParamBuilder = new StringBuilder();
if (!param.isEmpty()) {
callIdParamBuilder.append("?");
for (Map.Entry<String, String> entry : param.entrySet()) {
callIdParamBuilder.append(entry.getKey()).append("=").append(entry.getValue());
callIdParamBuilder.append("&");
} }
callIdParamBuilder.append("?").append(stringBuilder); callIdParamBuilder.deleteCharAt(callIdParamBuilder.length() - 1);
} }
String callIdParam = callIdParamBuilder.toString(); String callIdParam = callIdParamBuilder.toString();
streamInfoResult.setRtmp(addr, mediaServer.getRtmpPort(),mediaServer.getRtmpSSlPort(), app, stream, callIdParam); streamInfoResult.setRtmp(addr, mediaServer.getRtmpPort(),mediaServer.getRtmpSSlPort(), app, stream, callIdParam);

19
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
View File

@ -206,20 +206,23 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
streamInfoResult.setIp(addr); streamInfoResult.setIp(addr);
streamInfoResult.setMediaServer(mediaServer); streamInfoResult.setMediaServer(mediaServer);
StringBuilder callIdParamBuilder = new StringBuilder();; Map<String, String> param = new HashMap<>();
if (!ObjectUtils.isEmpty(callId) || (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr()))) {
StringBuilder stringBuilder = new StringBuilder();
if (!ObjectUtils.isEmpty(callId)) { if (!ObjectUtils.isEmpty(callId)) {
stringBuilder.append("callId=").append(callId); param.put("callId", callId);
} }
if (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr())) { if (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr())) {
if (!ObjectUtils.isEmpty(callId)) { param.put("originTypeStr", mediaInfo.getOriginTypeStr());
stringBuilder.append("&");
} }
stringBuilder.append("originTypeStr=").append(mediaInfo.getOriginTypeStr()); StringBuilder callIdParamBuilder = new StringBuilder();
if (!param.isEmpty()) {
callIdParamBuilder.append("?");
for (Map.Entry<String, String> entry : param.entrySet()) {
callIdParamBuilder.append(entry.getKey()).append("=").append(entry.getValue());
callIdParamBuilder.append("&");
} }
callIdParamBuilder.append("?").append(stringBuilder); callIdParamBuilder.deleteCharAt(callIdParamBuilder.length() - 1);
} }
String callIdParam = callIdParamBuilder.toString(); String callIdParam = callIdParamBuilder.toString();
streamInfoResult.setRtmp(addr, mediaServer.getRtmpPort(),mediaServer.getRtmpSSlPort(), app, stream, callIdParam); streamInfoResult.setRtmp(addr, mediaServer.getRtmpPort(),mediaServer.getRtmpSSlPort(), app, stream, callIdParam);