From e4e6209835eaae8eab9e6210f3bdf52b23de4c7a Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 16 Nov 2020 12:37:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=84=E7=90=86Catalog?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E9=81=87=E5=88=B0=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/impl/MessageRequestProcessor.java | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java index 06afc352..b976f3b7 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java @@ -215,12 +215,27 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { deviceChannel.setPort(itemDevice.element("Port") == null ? 0 : Integer.parseInt(XmlUtil.getText(itemDevice, "Port"))); deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password")); - deviceChannel.setLongitude(itemDevice.element("Longitude") == null ? 0.00 - : Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude"))); - deviceChannel.setLatitude(itemDevice.element("Latitude") == null ? 0.00 - : Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude"))); - deviceChannel.setPTZType(itemDevice.element("PTZType") == null ? 0 - : Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType"))); + if (itemDevice.element("Longitute")==null) { + deviceChannel.setLongitude(0.00); + } else { + deviceChannel.setLongitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude"))); + } + if (itemDevice.element("Latitute") == null) { + deviceChannel.setLatitude(0.00); + } else { + deviceChannel.setLatitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude"))); + } + if (itemDevice.element("PTZType") == null) { + deviceChannel.setPTZType(0); + } else { + deviceChannel.setPTZType(Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType"))); + } + // deviceChannel.setLongitude(itemDevice.element("Longitude") == null ? 0.00 + // : Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude"))); + // deviceChannel.setLatitude(itemDevice.element("Latitude") == null ? 0.00 + // : Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude"))); + // deviceChannel.setPTZType(itemDevice.element("PTZType") == null ? 0 + // : Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType"))); deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC storager.updateChannel(device.getDeviceId(), deviceChannel); } From 24cd9158d418bdacd88d080a2c80ac814be57948 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 16 Nov 2020 12:39:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BD=95=E5=83=8F=E5=9B=9E=E6=94=BE?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=A0=B7=E6=A0=B9=E6=8D=AE=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=86=B3=E5=AE=9A=E6=98=AF=E5=90=A6=E4=BA=8B=E5=85=88=E5=8F=96?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vmanager/playback/PlaybackController.java | 134 ++++++++++-------- 1 file changed, 75 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java index 56d1c7bd..16713fed 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java @@ -7,6 +7,7 @@ import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; @@ -26,29 +27,33 @@ import com.genersoft.iot.vmp.storager.IVideoManagerStorager; @RestController @RequestMapping("/api") public class PlaybackController { - + private final static Logger logger = LoggerFactory.getLogger(PlaybackController.class); - + @Autowired private SIPCommander cmder; - + @Autowired private IVideoManagerStorager storager; @Autowired private ZLMRESTfulUtils zlmresTfulUtils; + @Value("${media.closeWaitRTPInfo}") + private boolean closeWaitRTPInfo; + @GetMapping("/playback/{deviceId}/{channelId}") - public ResponseEntity play(@PathVariable String deviceId,@PathVariable String channelId, String startTime, String endTime){ - + public ResponseEntity play(@PathVariable String deviceId, @PathVariable String channelId, String startTime, + String endTime) { + if (logger.isDebugEnabled()) { - logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s",deviceId, channelId)); + logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId)); } - + if (StringUtils.isEmpty(deviceId) || StringUtils.isEmpty(channelId)) { - String log = String.format("设备回放 API调用失败，deviceId：%s ，channelId：%s",deviceId, channelId); + String log = String.format("设备回放 API调用失败，deviceId：%s ，channelId：%s", deviceId, channelId); logger.warn(log); - return new ResponseEntity(log,HttpStatus.BAD_REQUEST); + return new ResponseEntity(log, HttpStatus.BAD_REQUEST); } Device device = storager.queryVideoDevice(deviceId); @@ -58,20 +63,22 @@ public class PlaybackController { cmder.streamByeCmd(streamInfo.getSsrc()); } -// }else { -// String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase(); -// JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); -// if (rtpInfo.getBoolean("exist")) { -// return new ResponseEntity(JSON.toJSONString(streamInfo),HttpStatus.OK); -// }else { -// storager.stopPlayback(streamInfo); -// streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime); -// } -// } + // }else { + // String streamId = String.format("%08x", + // Integer.parseInt(streamInfo.getSsrc())).toUpperCase(); + // JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); + // if (rtpInfo.getBoolean("exist")) { + // return new + // ResponseEntity(JSON.toJSONString(streamInfo),HttpStatus.OK); + // }else { + // storager.stopPlayback(streamInfo); + // streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime); + // } + // } streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime); String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase(); - + if (logger.isDebugEnabled()) { logger.debug("设备回放 API调用，ssrc：" + streamInfo.getSsrc() + ",ZLMedia streamId:" + streamId); } @@ -81,62 +88,71 @@ public class PlaybackController { long lockStartTime = System.currentTimeMillis(); JSONObject rtpInfo = null; - while (lockFlag) { - try { - if (System.currentTimeMillis() - lockStartTime > 75 * 1000) { - storager.stopPlayback(streamInfo); - logger.info("播放等待超时"); - return new ResponseEntity("timeout",HttpStatus.OK); - }else { - streamInfo = storager.queryPlaybackByDevice(deviceId, channelId); - if (!rtpPushed) { - logger.info("查询RTP推流信息..."); - rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); - } - if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null && streamInfo.getFlv() != null){ - logger.info("查询流编码信息："+streamInfo.getFlv()); - rtpPushed = true; - Thread.sleep(2000); - JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId); - if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) { - lockFlag = false; - logger.info("流编码信息已获取"); - JSONArray tracks = mediaInfo.getJSONArray("tracks"); - streamInfo.setTracks(tracks); - storager.startPlayback(streamInfo); - }else { - logger.info("流编码信息未获取，2秒后重试..."); + if (closeWaitRTPInfo) { + String flv = storager.getMediaInfo().getWanIp() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/" + + streamId + ".flv"; + streamInfo.setFlv("http://" + flv); + streamInfo.setWs_flv("ws://" + flv); + storager.startPlayback(streamInfo); + } else { + while (lockFlag) { + try { + if (System.currentTimeMillis() - lockStartTime > 75 * 1000) { + storager.stopPlayback(streamInfo); + logger.info("播放等待超时"); + return new ResponseEntity("timeout", HttpStatus.OK); + } else { + streamInfo = storager.queryPlaybackByDevice(deviceId, channelId); + if (!rtpPushed) { + logger.info("查询RTP推流信息..."); + rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); + } + if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null + && streamInfo.getFlv() != null) { + logger.info("查询流编码信息：" + streamInfo.getFlv()); + rtpPushed = true; + Thread.sleep(2000); + JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId); + if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) { + lockFlag = false; + logger.info("流编码信息已获取"); + JSONArray tracks = mediaInfo.getJSONArray("tracks"); + streamInfo.setTracks(tracks); + storager.startPlayback(streamInfo); + } else { + logger.info("流编码信息未获取，2秒后重试..."); + } + } else { + Thread.sleep(2000); + continue; } - }else { - Thread.sleep(2000); - continue; } + } catch (InterruptedException e) { + e.printStackTrace(); } - } catch (InterruptedException e) { - e.printStackTrace(); } } - if(streamInfo!=null) { - return new ResponseEntity(JSON.toJSONString(streamInfo),HttpStatus.OK); + if (streamInfo != null) { + return new ResponseEntity(JSON.toJSONString(streamInfo), HttpStatus.OK); } else { logger.warn("设备回放API调用失败！"); return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR); } } - + @RequestMapping("/playback/{ssrc}/stop") - public ResponseEntity playStop(@PathVariable String ssrc){ - + public ResponseEntity playStop(@PathVariable String ssrc) { + cmder.streamByeCmd(ssrc); - + if (logger.isDebugEnabled()) { logger.debug(String.format("设备录像回放停止 API调用，ssrc：%s", ssrc)); } - - if(ssrc!=null) { + + if (ssrc != null) { JSONObject json = new JSONObject(); json.put("ssrc", ssrc); - return new ResponseEntity(json.toString(),HttpStatus.OK); + return new ResponseEntity(json.toString(), HttpStatus.OK); } else { logger.warn("设备录像回放停止API调用失败！"); return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);