XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复stream-none-reader-delay-ms为-1时不自动关闭流

Browse Source
This commit is contained in:
64850858
2021-07-26 17:22:40 +08:00
parent ea32cd2673
commit 95ed662935
11 changed files with 70 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@@ -346,6 +346,10 @@ public class ZLMHttpHookListener {
redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);
}
}
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
if (mediaServerItem != null && "-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())) {
ret.put("close", false);
}
return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}else {
JSONObject ret = new JSONObject();
@@ -371,7 +375,7 @@ public class ZLMHttpHookListener {
if (userSetup.isAutoApplyPlay() && mediaInfo != null) {
String app = json.getString("app");
String streamId = json.getString("stream");
if ("rtp".equals(app) && streamId.contains("gb_play") ) {
if ("rtp".equals(app)) {
String[] s = streamId.split("_");
if (s.length == 4) {
String deviceId = s[2];
@@ -382,7 +386,7 @@ public class ZLMHttpHookListener {
SSRCInfo ssrcInfo;
String streamId2 = null;
if (mediaInfo.isRtpEnable()) {
streamId2 = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
streamId2 = String.format("%s/%s", device.getDeviceId(), channelId);
}
ssrcInfo = mediaServerService.openRTPServer(mediaInfo, streamId2);
cmder.playStreamCmd(mediaInfo, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {