From bab5a5ab5e452b6f9cb0cb0efccf85a93c876676 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 16 十一月 2021 18:16:54 +0800
Subject: [PATCH] 添加TODO注释
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 478772a..f74dcfa 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -31,7 +31,7 @@
import javax.servlet.http.HttpServletRequest;
/**
- * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
+ * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48
*/
@@ -326,6 +326,7 @@
String streamId = json.getString("stream");
String app = json.getString("app");
+ // TODO 濡傛灉鍦ㄧ粰涓婄骇鎺ㄦ祦锛屼篃涓嶅仠姝€��
if ("rtp".equals(app)){
JSONObject ret = new JSONObject();
ret.put("code", 0);
@@ -345,6 +346,10 @@
cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(), streamInfoForPlayBackCatch.getChannelId());
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 {
@@ -371,18 +376,18 @@
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];
- String channelId = s[3];
+ if (s.length == 2) {
+ String deviceId = s[0];
+ String channelId = s[1];
Device device = storager.queryVideoDevice(deviceId);
if (device != null) {
UUID uuid = UUID.randomUUID();
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) -> {
--
Gitblit v1.8.0