From 87e7d0026f2a0feae169f103f90256005968b6aa Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: Fri, 23 Jul 2021 16:56:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3@value=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/conf/MediaConfig.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java index 88e8a64d..f2a0bcd0 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java @@ -31,31 +31,31 @@ public class MediaConfig implements IMediaServerItem { private Integer httpPort; @Value("${media.http-ssl-port:0}") - private Integer httpSSlPort; + private Integer httpSSlPort = 0; @Value("${media.rtmp-port:0}") - private Integer rtmpPort; + private Integer rtmpPort = 0; @Value("${media.rtmp-ssl-port:0}") - private Integer rtmpSSlPort; + private Integer rtmpSSlPort = 0; @Value("${media.rtp-proxy-port:0}") - private Integer rtpProxyPort; + private Integer rtpProxyPort = 0; @Value("${media.rtsp-port:0}") - private Integer rtspPort; + private Integer rtspPort = 0; @Value("${media.rtsp-ssl-port:0}") - private Integer rtspSSLPort; + private Integer rtspSSLPort = 0; @Value("${media.auto-config:true}") - private boolean autoConfig; + private boolean autoConfig = true; @Value("${media.secret}") private String secret; @Value("${media.stream-none-reader-delay-ms:18000}") - private String streamNoneReaderDelayMS; + private String streamNoneReaderDelayMS = "18000"; @Value("${media.rtp.enable}") private boolean rtpEnable; @@ -64,7 +64,7 @@ public class MediaConfig implements IMediaServerItem { private String rtpPortRange; @Value("${media.record-assist-port:0}") - private Integer recordAssistPort; + private Integer recordAssistPort = 0; private String updateTime; From bc37cdd57b7e4401035279c6db6883a2984e5f70 Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: Fri, 23 Jul 2021 16:58:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=89=93=E5=AD=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java index 1c06e0c9..f0eca856 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java @@ -94,7 +94,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { List interfaceAuthenticationExcludes = userSetup.getInterfaceAuthenticationExcludes(); for (String interfaceAuthenticationExclude : interfaceAuthenticationExcludes) { if (interfaceAuthenticationExclude.split("/").length < 4 ) { - logger.warn("{}不满足两极目录，已忽略", interfaceAuthenticationExclude); + logger.warn("{}不满足两级目录，已忽略", interfaceAuthenticationExclude); }else { web.ignoring().antMatchers(interfaceAuthenticationExclude); } From 324ae744d757ad329e79770d1a0fbc4d3dfc4602 Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: Fri, 23 Jul 2021 17:01:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=AA=92=E4=BD=93=E4=B8=8B=E8=BD=BD=E4=BF=A1=E4=BB=A4=E5=8F=8A?= =?UTF-8?q?API=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gb28181/transmit/cmd/ISIPCommander.java | 13 +- .../transmit/cmd/impl/SIPCommander.java | 114 ++++++++++++++ .../gb28181/playback/DownloadController.java | 140 ++++++++++++++++++ .../src/components/dialog/devicePlayer.vue | 37 ++++- web_src/src/components/dialog/easyPlayer.vue | 4 +- 5 files changed, 304 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java index b06fa773..99da23d6 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java @@ -103,7 +103,18 @@ public interface ISIPCommander { * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss */ void playbackStreamCmd(IMediaServerItem mediaServerItem,Device device, String channelId, String startTime, String endTime, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent); - + + /** + * 请求历史媒体下载 + * + * @param device 视频设备 + * @param channelId 预览通道 + * @param startTime 开始时间,格式要求：yyyy-MM-dd HH:mm:ss + * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss + * @param downloadSpeed 下载倍速参数 + */ + void downloadStreamCmd(IMediaServerItem mediaServerItem,Device device, String channelId, String startTime, String endTime, String downloadSpeed, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent); + /** * 视频流停止 * diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java index 5c2fa32d..d2318dcd 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java @@ -555,7 +555,121 @@ public class SIPCommander implements ISIPCommander { } } + /** + * 请求历史媒体下载 + * + * @param device 视频设备 + * @param channelId 预览通道 + * @param startTime 开始时间,格式要求：yyyy-MM-dd HH:mm:ss + * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss + * @param downloadSpeed 下载倍速参数 + */ + @Override + public void downloadStreamCmd(IMediaServerItem mediaServerItem,Device device, String channelId, String startTime, String endTime, String downloadSpeed, ZLMHttpHookSubscribe.Event event + , SipSubscribe.Event errorEvent) { + try { + String ssrc = streamSession.createPlayBackSsrc(); + String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase(); + + Integer mediaPort = null; + // 使用动态udp端口 + if (mediaServerItem.isRtpEnable()) { + mediaPort = zlmrtpServerFactory.createRTPServer(mediaServerItem, streamId); + }else { + mediaPort = mediaServerItem.getRtpProxyPort(); + } + logger.info("{} 分配的ZLM为: {} [{}:{}]", streamId, mediaServerItem.getId(), mediaServerItem.getIp(), mediaPort); + // 添加订阅 + JSONObject subscribeKey = new JSONObject(); + subscribeKey.put("app", "rtp"); + subscribeKey.put("stream", streamId); + subscribeKey.put("regist", true); + subscribeKey.put("mediaServerId", mediaServerItem.getId()); + logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey.toString()); + subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey, + (IMediaServerItem mediaServerItemInUse, JSONObject json)->{ + if (userSetup.isWaitTrack() && json.getJSONArray("tracks") == null) return; + event.response(mediaServerItemInUse, json); + subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey); + }); + + StringBuffer content = new StringBuffer(200); + content.append("v=0\r\n"); + content.append("o="+sipConfig.getSipId()+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n"); + content.append("s=Download\r\n"); + content.append("u="+channelId+":0\r\n"); + content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n"); + content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" " + +DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n"); + + + + String streamMode = device.getStreamMode().toUpperCase(); + + if (userSetup.isSeniorSdp()) { + if("TCP-PASSIVE".equals(streamMode)) { + content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n"); + }else if ("TCP-ACTIVE".equals(streamMode)) { + content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n"); + }else if("UDP".equals(streamMode)) { + content.append("m=video "+ mediaPort +" RTP/AVP 96 126 125 99 34 98 97\r\n"); + } + content.append("a=recvonly\r\n"); + content.append("a=rtpmap:96 PS/90000\r\n"); + content.append("a=fmtp:126 profile-level-id=42e01e\r\n"); + content.append("a=rtpmap:126 H264/90000\r\n"); + content.append("a=rtpmap:125 H264S/90000\r\n"); + content.append("a=fmtp:125 profile-level-id=42e01e\r\n"); + content.append("a=rtpmap:99 MP4V-ES/90000\r\n"); + content.append("a=fmtp:99 profile-level-id=3\r\n"); + content.append("a=rtpmap:98 H264/90000\r\n"); + content.append("a=rtpmap:97 MPEG4/90000\r\n"); + if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式 + content.append("a=setup:passive\r\n"); + content.append("a=connection:new\r\n"); + }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式 + content.append("a=setup:active\r\n"); + content.append("a=connection:new\r\n"); + } + }else { + if("TCP-PASSIVE".equals(streamMode)) { + content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n"); + }else if ("TCP-ACTIVE".equals(streamMode)) { + content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n"); + }else if("UDP".equals(streamMode)) { + content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\r\n"); + } + content.append("a=recvonly\r\n"); + content.append("a=rtpmap:96 PS/90000\r\n"); + content.append("a=rtpmap:98 H264/90000\r\n"); + content.append("a=rtpmap:97 MPEG4/90000\r\n"); + if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式 + content.append("a=setup:passive\r\n"); + content.append("a=connection:new\r\n"); + }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式 + content.append("a=setup:active\r\n"); + content.append("a=connection:new\r\n"); + } + } + content.append("a=downloadspeed:" + downloadSpeed + "\r\n"); + + content.append("y="+ssrc+"\r\n");//ssrc + + String tm = Long.toString(System.currentTimeMillis()); + + CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() + : udpSipProvider.getNewCallId(); + + Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader); + + ClientTransaction transaction = transmitRequest(device, request, errorEvent); + streamSession.put(device.getDeviceId(), channelId, ssrc, streamId, transaction); + + } catch ( SipException | ParseException | InvalidArgumentException e) { + e.printStackTrace(); + } + } /** * 视频流停止, 不使用回调 diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java new file mode 100644 index 00000000..218debfa --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java @@ -0,0 +1,140 @@ +package com.genersoft.iot.vmp.vmanager.gb28181.playback; + +import com.genersoft.iot.vmp.common.StreamInfo; +import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; +import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; +//import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; +import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem; +import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; +import com.genersoft.iot.vmp.storager.IRedisCatchStorage; +import com.genersoft.iot.vmp.service.IPlayService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.alibaba.fastjson.JSONObject; +import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; +import com.genersoft.iot.vmp.storager.IVideoManagerStorager; +import org.springframework.web.context.request.async.DeferredResult; + +import javax.sip.message.Response; +import java.util.UUID; + +@Api(tags = "历史媒体下载") +@CrossOrigin +@RestController +@RequestMapping("/api/download") +public class DownloadController { + + private final static Logger logger = LoggerFactory.getLogger(DownloadController.class); + + @Autowired + private SIPCommander cmder; + + @Autowired + private IVideoManagerStorager storager; + + @Autowired + private IRedisCatchStorage redisCatchStorage; + + // @Autowired + // private ZLMRESTfulUtils zlmresTfulUtils; + + @Autowired + private IPlayService playService; + + @Autowired + private DeferredResultHolder resultHolder; + + @ApiOperation("开始历史媒体下载") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value = "设备ID", dataTypeClass = String.class), + @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class), + @ApiImplicitParam(name = "startTime", value = "开始时间", dataTypeClass = String.class), + @ApiImplicitParam(name = "endTime", value = "结束时间", dataTypeClass = String.class), + @ApiImplicitParam(name = "downloadSpeed", value = "下载倍速", dataTypeClass = String.class), + }) + @GetMapping("/start/{deviceId}/{channelId}") + public DeferredResult> play(@PathVariable String deviceId, @PathVariable String channelId, + String startTime, String endTime, String downloadSpeed) { + + if (logger.isDebugEnabled()) { + logger.debug(String.format("历史媒体下载 API调用，deviceId：%s，channelId：%s，downloadSpeed：%s", deviceId, channelId, downloadSpeed)); + } + UUID uuid = UUID.randomUUID(); + DeferredResult> result = new DeferredResult>(30000L); + // 超时处理 + result.onTimeout(()->{ + logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%s", deviceId, channelId)); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); + msg.setData("Timeout"); + resultHolder.invokeResult(msg); + }); + Device device = storager.queryVideoDevice(deviceId); + StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId); + if (streamInfo != null) { + // 停止之前的下载 + cmder.streamByeCmd(deviceId, channelId); + } + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result); + IMediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device); + if (newMediaServerItem == null) { + logger.warn(String.format("设备下载响应超时，deviceId：%s ，channelId：%s", deviceId, channelId)); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); + msg.setData("Timeout"); + resultHolder.invokeResult(msg); + return result; + } + cmder.downloadStreamCmd(newMediaServerItem, device, channelId, startTime, endTime, downloadSpeed, (IMediaServerItem mediaServerItem, JSONObject response) -> { + logger.info("收到订阅消息： " + response.toJSONString()); + playService.onPublishHandlerForPlayBack(mediaServerItem, response, deviceId, channelId, uuid.toString()); + }, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); + msg.setData(String.format("回放失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + + return result; + } + + @ApiOperation("停止历史媒体下载") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value = "设备ID", dataTypeClass = String.class), + @ApiImplicitParam(name = "channelId", value = "通道ID", dataTypeClass = String.class), + }) + @GetMapping("/stop/{deviceId}/{channelId}") + public ResponseEntity playStop(@PathVariable String deviceId, @PathVariable String channelId) { + + cmder.streamByeCmd(deviceId, channelId); + + if (logger.isDebugEnabled()) { + logger.debug(String.format("设备历史媒体下载停止 API调用，deviceId/channelId：%s/%s", deviceId, channelId)); + } + + if (deviceId != null && channelId != null) { + JSONObject json = new JSONObject(); + json.put("deviceId", deviceId); + json.put("channelId", channelId); + return new ResponseEntity(json.toString(), HttpStatus.OK); + } else { + logger.warn("设备历史媒体下载停止API调用失败！"); + return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR); + } + } +} diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue index 020cc220..be1332ef 100644 --- a/web_src/src/components/dialog/devicePlayer.vue +++ b/web_src/src/components/dialog/devicePlayer.vue @@ -48,7 +48,10 @@ @@ -444,6 +447,38 @@ export default { if (callback) callback() }); }, + downloadRecord: function (row) { + let that = this; + if (that.streamId != "") { + that.stopDownloadRecord(function () { + that.streamId = "", + that.downloadRecord(row); + }) + } else { + this.$axios({ + method: 'get', + url: '/api/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' + + row.endTime + '&downloadSpeed=4' + }).then(function (res) { + var streamInfo = res.data; + that.app = streamInfo.app; + that.streamId = streamInfo.streamId; + that.mediaServerId = streamInfo.mediaServerId; + that.videoUrl = that.getUrlByStreamInfo(streamInfo); + that.recordPlay = true; + }); + } + }, + stopDownloadRecord: function (callback) { + this.$refs.videoPlayer.pause(); + this.videoUrl = ''; + this.$axios({ + method: 'get', + url: '/api/download/stop/' + this.deviceId + "/" + this.channelId + }).then(function (res) { + if (callback) callback() + }); + }, ptzCamera: function (leftRight, upDown, zoom) { console.log('云台控制：' + leftRight + ' : ' + upDown + " : " + zoom); let that = this; diff --git a/web_src/src/components/dialog/easyPlayer.vue b/web_src/src/components/dialog/easyPlayer.vue index 1b0ed21f..daf72079 100644 --- a/web_src/src/components/dialog/easyPlayer.vue +++ b/web_src/src/components/dialog/easyPlayer.vue @@ -60,8 +60,8 @@ export default { min-width: 70px; } /* 隐藏logo */ - /* .iconqingxiLOGO { + .iconqingxiLOGO { display: none !important; - } */ + } From f8abd2603002eb6ff296d26f99042681d9b2bc92 Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: Fri, 23 Jul 2021 17:06:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=A8=E6=B5=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=92=AD=E6=94=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/PushVideoList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue index bdc086cb..8bf71c50 100644 --- a/web_src/src/components/PushVideoList.vue +++ b/web_src/src/components/PushVideoList.vue @@ -133,7 +133,7 @@ this.getListLoading = true; this.$axios({ method: 'get', - url:`/api/media/stream_info_by_app_and_stream`, + url: '/api/media/stream_info_by_app_and_stream', params: { app: row.app, stream: row.stream, @@ -142,7 +142,7 @@ }).then(function (res) { that.getListLoading = false; that.$refs.devicePlayer.openDialog("streamPlay", null, null, { - streamInfo: res.data, + streamInfo: res.data.data, hasAudio: true }); }).catch(function (error) {