From 4cdeeb4a3656a35c4b91cbcdd99d8b7c679f5e84 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 17 十一月 2020 15:27:13 +0800
Subject: [PATCH] 修复一些日志设置
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
index 780e950..a01748e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -38,10 +38,15 @@
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
+ @Value("${media.closeWaitRTPInfo}")
+ private boolean closeWaitRTPInfo;
+
@GetMapping("/play/{deviceId}/{channelId}")
public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId,
Integer getEncoding) {
+ if (getEncoding == null) getEncoding = 0;
+ getEncoding = closeWaitRTPInfo ? 0: getEncoding;
Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);
@@ -56,7 +61,6 @@
storager.stopPlay(streamInfo);
streamInfo = cmder.playStreamCmd(device, channelId);
}
-
}
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
// 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂30s
@@ -103,7 +107,7 @@
}
}
} else {
- String flv = storager.getMediaInfo().getLocalIP() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
+ String flv = storager.getMediaInfo().getWanIp() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
+ streamId + ".flv";
streamInfo.setFlv("http://" + flv);
streamInfo.setWs_flv("ws://" + flv);
@@ -130,7 +134,7 @@
cmder.streamByeCmd(ssrc);
StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
if (streamInfo == null)
- return new ResponseEntity<String>(HttpStatus.PAYMENT_REQUIRED);
+ return new ResponseEntity<String>("ssrc not found", HttpStatus.OK);
storager.stopPlay(streamInfo);
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧棰勮鍋滄API璋冪敤锛宻src锛�%s", ssrc));
@@ -146,3 +150,4 @@
}
}
}
+
--
Gitblit v1.8.0