From 534be3f5809f430cb46cb0fcbba99d3d425f2324 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 六月 2023 20:58:35 +0800
Subject: [PATCH] 支持redis消息强制关闭流
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 47 ++---------------------------------------------
1 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 5d04f10..556adf6 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -92,7 +92,7 @@
result.put("error","device[ " + serial + " ]鏈壘鍒�");
resultDeferredResult.setResult(result);
return resultDeferredResult;
- }else if (device.getOnline() == 0) {
+ }else if (!device.isOnLine()) {
JSONObject result = new JSONObject();
result.put("error","device[ " + code + " ]offline");
resultDeferredResult.setResult(result);
@@ -113,56 +113,13 @@
result.put("error","channel[ " + code + " ]鏈壘鍒�");
resultDeferredResult.setResult(result);
return resultDeferredResult;
- }else if (deviceChannel.getStatus() == 0) {
+ }else if (!deviceChannel.isStatus()) {
JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]offline");
resultDeferredResult.setResult(result);
return resultDeferredResult;
}
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
-// playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
-// InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
-// if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
-// JSONObject result = new JSONObject();
-// result.put("StreamID", inviteInfo.getStreamInfo().getStream());
-// result.put("DeviceID", device.getDeviceId());
-// result.put("ChannelID", code);
-// result.put("ChannelName", deviceChannel.getName());
-// result.put("ChannelCustomName", "");
-// result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
-// result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
-// result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
-// result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
-// result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
-// result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
-// result.put("CDN", "");
-// result.put("SnapURL", "");
-// result.put("Transport", device.getTransport());
-// result.put("StartAt", "");
-// result.put("Duration", "");
-// result.put("SourceVideoCodecName", "");
-// result.put("SourceVideoWidth", "");
-// result.put("SourceVideoHeight", "");
-// result.put("SourceVideoFrameRate", "");
-// result.put("SourceAudioCodecName", "");
-// result.put("SourceAudioSampleRate", "");
-// result.put("AudioEnable", "");
-// result.put("Ondemand", "");
-// result.put("InBytes", "");
-// result.put("InBitRate", "");
-// result.put("OutBytes", "");
-// result.put("NumOutputs", "");
-// result.put("CascadeSize", "");
-// result.put("RelaySize", "");
-// result.put("ChannelPTZType", "0");
-// resultDeferredResult.setResult(result);
-// }
-//
-// }, (eventResult) -> {
-// JSONObject result = new JSONObject();
-// result.put("error", "channel[ " + code + " ] " + eventResult.msg);
-// resultDeferredResult.setResult(result);
-// }, null);
playService.play(newMediaServerItem, serial, code, (errorCode, msg, data) -> {
--
Gitblit v1.8.0