From d58064587d02f3bb11b2b355c41aee6fc9931a6c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 21 十二月 2020 11:13:27 +0800
Subject: [PATCH] 修复兼容接口
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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..132e1e1 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
@@ -21,22 +21,17 @@
private int currentPort = 0;
- public int getNewRTPPort(String ssrc) {
- String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
+ public int getNewRTPPort(String streamId) {
+// String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
Map<String, Object> param = new HashMap<>();
int newPort = getPortFromUdpPortRange();
param.put("port", newPort);
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 {
+ } else {
return getNewRTPPort(streamId);
}
}
@@ -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