From cebea64d36bac571aa72b0f19cf3d7955175e959 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 19 十二月 2020 22:07:54 +0800
Subject: [PATCH] update readme
---
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
index 40b1b5b..b3fc247 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -34,8 +34,7 @@
@Autowired
private IVideoManagerStorager storager;
- @Value("${media.closeWaitRTPInfo}")
- private boolean closeWaitRTPInfo;
+ private boolean closeWaitRTPInfo = false;
@Autowired
@@ -94,15 +93,15 @@
StreamInfo streamInfo = storager.queryPlayByDevice(device.getDeviceId(), code);
if (streamInfo == null) {
logger.debug("streamInfo 绛変簬null, 閲嶆柊鐐规挱");
- streamInfo = cmder.playStreamCmd(device, code);
+// streamInfo = cmder.playStreamCmd(device, code);
}else {
logger.debug("streamInfo 涓嶇瓑浜巒ull, 鍚戞祦濯掍綋鏌ヨ鏄惁姝ｅ湪鎺ㄦ祦");
- String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
+ String streamId = streamInfo.getStreamId();
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
if (rtpInfo.getBoolean("exist")) {
logger.debug("鍚戞祦濯掍綋鏌ヨ姝ｅ湪鎺ㄦ祦, 鐩存帴杩斿洖: " + streamInfo.getRtsp());
JSONObject result = new JSONObject();
- result.put("StreamID", streamInfo.getSsrc());
+ result.put("StreamID", streamInfo.getStreamId());
result.put("DeviceID", device.getDeviceId());
result.put("ChannelID", code);
result.put("ChannelName", deviceChannel.getName());
@@ -136,13 +135,13 @@
} else {
logger.debug("鍚戞祦濯掍綋鏌ヨ娌℃湁鎺ㄦ祦, 閲嶆柊鐐规挱");
storager.stopPlay(streamInfo);
- streamInfo = cmder.playStreamCmd(device, code);
+// streamInfo = cmder.playStreamCmd(device, code);
}
}
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",serial, code));
- logger.debug("璁惧棰勮 API璋冪敤锛宻src锛�"+streamInfo.getSsrc()+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
+ logger.debug("璁惧棰勮 API璋冪敤锛宻treamId锛�"+streamInfo.getStreamId());
}
boolean lockFlag = true;
long startTime = System.currentTimeMillis();
@@ -174,7 +173,7 @@
}
if(streamInfo!=null) {
JSONObject result = new JSONObject();
- result.put("StreamID", streamInfo.getSsrc());
+ result.put("StreamID", streamInfo.getStreamId());
result.put("DeviceID", device.getDeviceId());
result.put("ChannelID", code);
result.put("ChannelName", deviceChannel.getName());
@@ -235,7 +234,7 @@
result.put("error","鏈壘鍒版祦淇℃伅");
return result;
}
- cmder.streamByeCmd(streamInfo.getSsrc());
+ cmder.streamByeCmd(streamInfo.getStreamId());
storager.stopPlay(streamInfo);
return null;
}
--
Gitblit v1.8.0