From 335916f1f15eb9d0b34dea38cacee2300eac0606 Mon Sep 17 00:00:00 2001
From: 李防 <liguofang0703@126.com>
Date: 星期一, 07 三月 2022 14:20:27 +0800
Subject: [PATCH] InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index b4d1048..76bab9c 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -107,8 +107,13 @@
int currentPort = mediaServerItem.getCurrentPort();
if (currentPort == 0) {
String[] portRangeStrArray = mediaServerItem.getSendRtpPortRange().split(",");
- portRangeArray[0] = Integer.parseInt(portRangeStrArray[0]);
- portRangeArray[1] = Integer.parseInt(portRangeStrArray[1]);
+ if (portRangeStrArray.length != 2) {
+ portRangeArray[0] = 30000;
+ portRangeArray[1] = 30500;
+ }else {
+ portRangeArray[0] = Integer.parseInt(portRangeStrArray[0]);
+ portRangeArray[1] = Integer.parseInt(portRangeStrArray[1]);
+ }
}
if (currentPort == 0 || currentPort++ > portRangeArray[1]) {
@@ -237,9 +242,18 @@
*/
public int totalReaderCount(MediaServerItem mediaServerItem, String app, String streamId) {
JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtmp", streamId);
+ Integer code = mediaInfo.getInteger("code");
if (mediaInfo == null) {
return 0;
}
+ if ( code < 0) {
+ logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
+ return -1;
+ }
+ if ( code == 0 && ! mediaInfo.getBoolean("online")) {
+ logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
+ return -1;
+ }
return mediaInfo.getInteger("totalReaderCount");
}
--
Gitblit v1.8.0