From 3d2aeb890b0d6bc13ea44ff6e0d5764bcf7aa529 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 14 十二月 2020 16:51:29 +0800
Subject: [PATCH] 使用线程安全的map存储订阅信息 修改点播消息内容,提升兼容性
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java
index 93e6a24..8195b65 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java
@@ -29,15 +29,10 @@
param.put("enable_tcp", 1);
param.put("stream_id", streamId);
JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param);
- if (jsonObject.getInteger("code") == 0) {
- System.out.println(11111111);
- System.out.println(streamId);
- System.out.println(ssrc);
- System.out.println(newPort);
- System.out.println(jsonObject.toJSONString());
+ if (jsonObject != null && jsonObject.getInteger("code") == 0) {
return newPort;
- }else {
- return getNewRTPPort(streamId);
+ } else {
+ return getNewRTPPort(ssrc);
}
}
@@ -48,11 +43,14 @@
udpPortRangeArray[1] = Integer.parseInt(udpPortRangeStrArray[1]);
}
- if (currentPort == 0 || currentPort ++ > udpPortRangeArray[1]) {
+ if (currentPort == 0 || currentPort++ > udpPortRangeArray[1]) {
currentPort = udpPortRangeArray[0];
return udpPortRangeArray[0];
- }else {
- return currentPort ++;
+ } else {
+ if (currentPort % 2 == 1) {
+ currentPort++;
+ }
+ return currentPort++;
}
}
}
--
Gitblit v1.8.0