From c1204f66156dd97ff765e7b8d847ca4b591b8413 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 16 十二月 2020 12:41:49 +0800
Subject: [PATCH] 修正转码播放停止后重复回调的错误
---
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 76df0d2..6180fbb 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,7 +93,7 @@
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();
@@ -106,9 +105,9 @@
result.put("DeviceID", device.getDeviceId());
result.put("ChannelID", code);
result.put("ChannelName", deviceChannel.getName());
- result.put("ChannelCustomName ", "");
- result.put("FLV ", streamInfo.getFlv());
- result.put("WS_FLV ", streamInfo.getWs_flv());
+ result.put("ChannelCustomName", "");
+ result.put("FLV", streamInfo.getFlv());
+ result.put("WS_FLV", streamInfo.getWs_flv());
result.put("RTMP", streamInfo.getRtmp());
result.put("HLS", streamInfo.getHls());
result.put("RTSP", streamInfo.getRtsp());
@@ -136,7 +135,7 @@
} else {
logger.debug("鍚戞祦濯掍綋鏌ヨ娌℃湁鎺ㄦ祦, 閲嶆柊鐐规挱");
storager.stopPlay(streamInfo);
- streamInfo = cmder.playStreamCmd(device, code);
+// streamInfo = cmder.playStreamCmd(device, code);
}
}
@@ -178,9 +177,9 @@
result.put("DeviceID", device.getDeviceId());
result.put("ChannelID", code);
result.put("ChannelName", deviceChannel.getName());
- result.put("ChannelCustomName ", "");
- result.put("FLV ", streamInfo.getFlv());
- result.put("WS_FLV ", streamInfo.getWs_flv());
+ result.put("ChannelCustomName", "");
+ result.put("FLV", streamInfo.getFlv());
+ result.put("WS_FLV", streamInfo.getWs_flv());
result.put("RTMP", streamInfo.getRtmp());
result.put("HLS", streamInfo.getHls());
result.put("RTSP", streamInfo.getRtsp());
--
Gitblit v1.8.0