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 f110e2bf..bedb8b5c 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
@@ -1,355 +1,355 @@
-package com.genersoft.iot.vmp.gb28181.transmit.cmd;
-
-import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.gb28181.bean.*;
-import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
-import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-
-import javax.sip.Dialog;
-
-/**
- * @description:设备能力接口,用于定义设备的控制、查询能力
- * @author: swwheihei
- * @date: 2020年5月3日 下午9:16:34
- */
-public interface ISIPCommander {
-
- /**
- * 云台方向放控制,使用配置文件中的默认镜头移动速度
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
- * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
- */
- boolean ptzdirectCmd(Device device,String channelId,int leftRight, int upDown);
-
- /**
- * 云台方向放控制
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
- * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
- * @param moveSpeed 镜头移动速度
- */
- boolean ptzdirectCmd(Device device,String channelId,int leftRight, int upDown, int moveSpeed);
-
- /**
- * 云台缩放控制,使用配置文件中的默认镜头缩放速度
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
- */
- boolean ptzZoomCmd(Device device,String channelId,int inOut);
-
- /**
- * 云台缩放控制
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
- */
- boolean ptzZoomCmd(Device device,String channelId,int inOut, int moveSpeed);
-
- /**
- * 云台控制,支持方向与缩放控制
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
- * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
- * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
- * @param moveSpeed 镜头移动速度
- * @param zoomSpeed 镜头缩放速度
- */
- boolean ptzCmd(Device device,String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed);
-
- /**
- * 前端控制,包括PTZ指令、FI指令、预置位指令、巡航指令、扫描指令和辅助开关指令
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param cmdCode 指令码
- * @param parameter1 数据1
- * @param parameter2 数据2
- * @param combineCode2 组合码2
- */
- boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2);
-
- /**
- * 前端控制指令(用于转发上级指令)
- * @param device 控制设备
- * @param channelId 预览通道
- * @param cmdString 前端控制指令串
- */
- boolean fronEndCmd(Device device, String channelId, String cmdString, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent);
-
- /**
- * 请求预览视频流
- * @param device 视频设备
- * @param channelId 预览通道
- */
- void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent);
-
- /**
- * 请求回放视频流
- *
- * @param device 视频设备
- * @param channelId 预览通道
- * @param startTime 开始时间,格式要求:yyyy-MM-dd HH:mm:ss
- * @param endTime 结束时间,格式要求:yyyy-MM-dd HH:mm:ss
- */
- void playbackStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInf, Device device, String channelId, String startTime, String endTime,InviteStreamCallback inviteStreamCallback, InviteStreamCallback 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(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
- String startTime, String endTime, int downloadSpeed, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
- SipSubscribe.Event errorEvent);
-
- /**
- * 视频流停止
- */
- void streamByeCmd(String deviceId, String channelId, String stream, String callId, SipSubscribe.Event okEvent);
- void streamByeCmd(String deviceId, String channelId, String stream, String callId);
-
- /**
- * 回放暂停
- */
- void playPauseCmd(Device device, StreamInfo streamInfo);
-
- /**
- * 回放恢复
- */
- void playResumeCmd(Device device, StreamInfo streamInfo);
-
- /**
- * 回放拖动播放
- */
- void playSeekCmd(Device device, StreamInfo streamInfo, long seekTime);
-
- /**
- * 回放倍速播放
- */
- void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed);
-
- /**
- * 回放控制
- * @param device
- * @param streamInfo
- * @param content
- */
- void playbackControlCmd(Device device, StreamInfo streamInfo, String content);
-
- /**
- * 语音广播
- *
- * @param device 视频设备
- * @param channelId 预览通道
- */
- boolean audioBroadcastCmd(Device device,String channelId);
-
- /**
- * 语音广播
- *
- * @param device 视频设备
- */
- void audioBroadcastCmd(Device device, SipSubscribe.Event okEvent);
- boolean audioBroadcastCmd(Device device);
-
- /**
- * 音视频录像控制
- *
- * @param device 视频设备
- * @param channelId 预览通道
- * @param recordCmdStr 录像命令:Record / StopRecord
- */
- boolean recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent);
-
- /**
- * 远程启动控制命令
- *
- * @param device 视频设备
- */
- boolean teleBootCmd(Device device);
-
- /**
- * 报警布防/撤防命令
- *
- * @param device 视频设备
- */
- boolean guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent);
-
- /**
- * 报警复位命令
- *
- * @param device 视频设备
- * @param alarmMethod 报警方式(可选)
- * @param alarmType 报警类型(可选)
- */
- boolean alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent);
-
- /**
- * 强制关键帧命令,设备收到此命令应立刻发送一个IDR帧
- *
- * @param device 视频设备
- * @param channelId 预览通道
- */
- boolean iFrameCmd(Device device, String channelId);
-
- /**
- * 看守位控制命令
- *
- * @param device 视频设备
- * @param enabled 看守位使能:1 = 开启,0 = 关闭
- * @param resetTime 自动归位时间间隔,开启看守位时使用,单位:秒(s)
- * @param presetIndex 调用预置位编号,开启看守位时使用,取值范围0~255
- */
- boolean homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent);
-
- /**
- * 设备配置命令
- *
- * @param device 视频设备
- */
- boolean deviceConfigCmd(Device device);
-
- /**
- * 设备配置命令:basicParam
- *
- * @param device 视频设备
- * @param channelId 通道编码(可选)
- * @param name 设备/通道名称(可选)
- * @param expiration 注册过期时间(可选)
- * @param heartBeatInterval 心跳间隔时间(可选)
- * @param heartBeatCount 心跳超时次数(可选)
- */
- boolean deviceBasicConfigCmd(Device device, String channelId, String name, String expiration, String heartBeatInterval, String heartBeatCount, SipSubscribe.Event errorEvent);
-
- /**
- * 查询设备状态
- *
- * @param device 视频设备
- */
- boolean deviceStatusQuery(Device device, SipSubscribe.Event errorEvent);
-
- /**
- * 查询设备信息
- *
- * @param device 视频设备
- * @return
- */
- boolean deviceInfoQuery(Device device);
-
- /**
- * 查询目录列表
- *
- * @param device 视频设备
- */
- boolean catalogQuery(Device device, int sn, SipSubscribe.Event errorEvent);
-
- /**
- * 查询录像信息
- *
- * @param device 视频设备
- * @param startTime 开始时间,格式要求:yyyy-MM-dd HH:mm:ss
- * @param endTime 结束时间,格式要求:yyyy-MM-dd HH:mm:ss
- * @param sn
- */
- boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, Integer Secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent);
-
- /**
- * 查询报警信息
- *
- * @param device 视频设备
- * @param startPriority 报警起始级别(可选)
- * @param endPriority 报警终止级别(可选)
- * @param alarmMethod 报警方式条件(可选)
- * @param alarmType 报警类型
- * @param startTime 报警发生起始时间(可选)
- * @param endTime 报警发生终止时间(可选)
- * @return true = 命令发送成功
- */
- boolean alarmInfoQuery(Device device, String startPriority, String endPriority, String alarmMethod,
- String alarmType, String startTime, String endTime, SipSubscribe.Event errorEvent);
-
- /**
- * 查询设备配置
- *
- * @param device 视频设备
- * @param channelId 通道编码(可选)
- * @param configType 配置类型:
- */
- boolean deviceConfigQuery(Device device, String channelId, String configType, SipSubscribe.Event errorEvent);
-
- /**
- * 查询设备预置位置
- *
- * @param device 视频设备
- */
- boolean presetQuery(Device device, String channelId, SipSubscribe.Event errorEvent);
-
- /**
- * 查询移动设备位置数据
- *
- * @param device 视频设备
- */
- boolean mobilePostitionQuery(Device device, SipSubscribe.Event errorEvent);
-
- /**
- * 订阅、取消订阅移动位置
- *
- * @param device 视频设备
- * @return true = 命令发送成功
- */
- boolean mobilePositionSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent , SipSubscribe.Event errorEvent);
-
- /**
- * 订阅、取消订阅报警信息
- * @param device 视频设备
- * @param expires 订阅过期时间(0 = 取消订阅)
- * @param startPriority 报警起始级别(可选)
- * @param endPriority 报警终止级别(可选)
- * @param alarmType 报警类型
- * @param startTime 报警发生起始时间(可选)
- * @param endTime 报警发生终止时间(可选)
- * @return true = 命令发送成功
- */
- boolean alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime);
-
- /**
- * 订阅、取消订阅目录信息
- * @param device 视频设备
- * @return true = 命令发送成功
- */
- boolean catalogSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent);
-
- /**
- * 拉框控制命令
- *
- * @param device 控制设备
- * @param channelId 通道id
- * @param cmdString 前端控制指令串
- */
- boolean dragZoomCmd(Device device, String channelId, String cmdString);
-
-
- /**
- * 向设备发送报警NOTIFY消息, 用于互联结构下,此时将设备当成一个平级平台看待
- * @param device 设备
- * @param deviceAlarm 报警信息信息
- * @return
- */
- boolean sendAlarmMessage(Device device, DeviceAlarm deviceAlarm);
-}
+package com.genersoft.iot.vmp.gb28181.transmit.cmd;
+
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
+import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
+
+import javax.sip.Dialog;
+
+/**
+ * @description:设备能力接口,用于定义设备的控制、查询能力
+ * @author: swwheihei
+ * @date: 2020年5月3日 下午9:16:34
+ */
+public interface ISIPCommander {
+
+ /**
+ * 云台方向放控制,使用配置文件中的默认镜头移动速度
+ *
+ * @param device 控制设备
+ * @param channelId 预览通道
+ * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
+ * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
+ */
+ boolean ptzdirectCmd(Device device,String channelId,int leftRight, int upDown);
+
+ /**
+ * 云台方向放控制
+ *
+ * @param device 控制设备
+ * @param channelId 预览通道
+ * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
+ * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
+ * @param moveSpeed 镜头移动速度
+ */
+ boolean ptzdirectCmd(Device device,String channelId,int leftRight, int upDown, int moveSpeed);
+
+ /**
+ * 云台缩放控制,使用配置文件中的默认镜头缩放速度
+ *
+ * @param device 控制设备
+ * @param channelId 预览通道
+ * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
+ */
+ boolean ptzZoomCmd(Device device,String channelId,int inOut);
+
+ /**
+ * 云台缩放控制
+ *
+ * @param device 控制设备
+ * @param channelId 预览通道
+ * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
+ */
+ boolean ptzZoomCmd(Device device,String channelId,int inOut, int moveSpeed);
+
+ /**
+ * 云台控制,支持方向与缩放控制
+ *
+ * @param device 控制设备
+ * @param channelId 预览通道
+ * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
+ * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
+ * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
+ * @param moveSpeed 镜头移动速度
+ * @param zoomSpeed 镜头缩放速度
+ */
+ boolean ptzCmd(Device device,String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed);
+
+ /**
+ * 前端控制,包括PTZ指令、FI指令、预置位指令、巡航指令、扫描指令和辅助开关指令
+ *
+ * @param device 控制设备
+ * @param channelId 预览通道
+ * @param cmdCode 指令码
+ * @param parameter1 数据1
+ * @param parameter2 数据2
+ * @param combineCode2 组合码2
+ */
+ boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2);
+
+ /**
+ * 前端控制指令(用于转发上级指令)
+ * @param device 控制设备
+ * @param channelId 预览通道
+ * @param cmdString 前端控制指令串
+ */
+ boolean fronEndCmd(Device device, String channelId, String cmdString, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent);
+
+ /**
+ * 请求预览视频流
+ * @param device 视频设备
+ * @param channelId 预览通道
+ */
+ void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent);
+
+ /**
+ * 请求回放视频流
+ *
+ * @param device 视频设备
+ * @param channelId 预览通道
+ * @param startTime 开始时间,格式要求:yyyy-MM-dd HH:mm:ss
+ * @param endTime 结束时间,格式要求:yyyy-MM-dd HH:mm:ss
+ */
+ void playbackStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInf, Device device, String channelId, String startTime, String endTime,InviteStreamCallback inviteStreamCallback, InviteStreamCallback 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(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
+ String startTime, String endTime, int downloadSpeed, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
+ SipSubscribe.Event errorEvent);
+
+ /**
+ * 视频流停止
+ */
+ void streamByeCmd(String deviceId, String channelId, String stream, String callId, SipSubscribe.Event okEvent);
+ void streamByeCmd(String deviceId, String channelId, String stream, String callId);
+
+ /**
+ * 回放暂停
+ */
+ void playPauseCmd(Device device, StreamInfo streamInfo);
+
+ /**
+ * 回放恢复
+ */
+ void playResumeCmd(Device device, StreamInfo streamInfo);
+
+ /**
+ * 回放拖动播放
+ */
+ void playSeekCmd(Device device, StreamInfo streamInfo, long seekTime);
+
+ /**
+ * 回放倍速播放
+ */
+ void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed);
+
+ /**
+ * 回放控制
+ * @param device
+ * @param streamInfo
+ * @param content
+ */
+ void playbackControlCmd(Device device, StreamInfo streamInfo, String content,SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent);
+
+ /**
+ * 语音广播
+ *
+ * @param device 视频设备
+ * @param channelId 预览通道
+ */
+ boolean audioBroadcastCmd(Device device,String channelId);
+
+ /**
+ * 语音广播
+ *
+ * @param device 视频设备
+ */
+ void audioBroadcastCmd(Device device, SipSubscribe.Event okEvent);
+ boolean audioBroadcastCmd(Device device);
+
+ /**
+ * 音视频录像控制
+ *
+ * @param device 视频设备
+ * @param channelId 预览通道
+ * @param recordCmdStr 录像命令:Record / StopRecord
+ */
+ boolean recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent);
+
+ /**
+ * 远程启动控制命令
+ *
+ * @param device 视频设备
+ */
+ boolean teleBootCmd(Device device);
+
+ /**
+ * 报警布防/撤防命令
+ *
+ * @param device 视频设备
+ */
+ boolean guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent);
+
+ /**
+ * 报警复位命令
+ *
+ * @param device 视频设备
+ * @param alarmMethod 报警方式(可选)
+ * @param alarmType 报警类型(可选)
+ */
+ boolean alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent);
+
+ /**
+ * 强制关键帧命令,设备收到此命令应立刻发送一个IDR帧
+ *
+ * @param device 视频设备
+ * @param channelId 预览通道
+ */
+ boolean iFrameCmd(Device device, String channelId);
+
+ /**
+ * 看守位控制命令
+ *
+ * @param device 视频设备
+ * @param enabled 看守位使能:1 = 开启,0 = 关闭
+ * @param resetTime 自动归位时间间隔,开启看守位时使用,单位:秒(s)
+ * @param presetIndex 调用预置位编号,开启看守位时使用,取值范围0~255
+ */
+ boolean homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent);
+
+ /**
+ * 设备配置命令
+ *
+ * @param device 视频设备
+ */
+ boolean deviceConfigCmd(Device device);
+
+ /**
+ * 设备配置命令:basicParam
+ *
+ * @param device 视频设备
+ * @param channelId 通道编码(可选)
+ * @param name 设备/通道名称(可选)
+ * @param expiration 注册过期时间(可选)
+ * @param heartBeatInterval 心跳间隔时间(可选)
+ * @param heartBeatCount 心跳超时次数(可选)
+ */
+ boolean deviceBasicConfigCmd(Device device, String channelId, String name, String expiration, String heartBeatInterval, String heartBeatCount, SipSubscribe.Event errorEvent);
+
+ /**
+ * 查询设备状态
+ *
+ * @param device 视频设备
+ */
+ boolean deviceStatusQuery(Device device, SipSubscribe.Event errorEvent);
+
+ /**
+ * 查询设备信息
+ *
+ * @param device 视频设备
+ * @return
+ */
+ boolean deviceInfoQuery(Device device);
+
+ /**
+ * 查询目录列表
+ *
+ * @param device 视频设备
+ */
+ boolean catalogQuery(Device device, int sn, SipSubscribe.Event errorEvent);
+
+ /**
+ * 查询录像信息
+ *
+ * @param device 视频设备
+ * @param startTime 开始时间,格式要求:yyyy-MM-dd HH:mm:ss
+ * @param endTime 结束时间,格式要求:yyyy-MM-dd HH:mm:ss
+ * @param sn
+ */
+ boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, Integer Secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent);
+
+ /**
+ * 查询报警信息
+ *
+ * @param device 视频设备
+ * @param startPriority 报警起始级别(可选)
+ * @param endPriority 报警终止级别(可选)
+ * @param alarmMethod 报警方式条件(可选)
+ * @param alarmType 报警类型
+ * @param startTime 报警发生起始时间(可选)
+ * @param endTime 报警发生终止时间(可选)
+ * @return true = 命令发送成功
+ */
+ boolean alarmInfoQuery(Device device, String startPriority, String endPriority, String alarmMethod,
+ String alarmType, String startTime, String endTime, SipSubscribe.Event errorEvent);
+
+ /**
+ * 查询设备配置
+ *
+ * @param device 视频设备
+ * @param channelId 通道编码(可选)
+ * @param configType 配置类型:
+ */
+ boolean deviceConfigQuery(Device device, String channelId, String configType, SipSubscribe.Event errorEvent);
+
+ /**
+ * 查询设备预置位置
+ *
+ * @param device 视频设备
+ */
+ boolean presetQuery(Device device, String channelId, SipSubscribe.Event errorEvent);
+
+ /**
+ * 查询移动设备位置数据
+ *
+ * @param device 视频设备
+ */
+ boolean mobilePostitionQuery(Device device, SipSubscribe.Event errorEvent);
+
+ /**
+ * 订阅、取消订阅移动位置
+ *
+ * @param device 视频设备
+ * @return true = 命令发送成功
+ */
+ boolean mobilePositionSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent , SipSubscribe.Event errorEvent);
+
+ /**
+ * 订阅、取消订阅报警信息
+ * @param device 视频设备
+ * @param expires 订阅过期时间(0 = 取消订阅)
+ * @param startPriority 报警起始级别(可选)
+ * @param endPriority 报警终止级别(可选)
+ * @param alarmType 报警类型
+ * @param startTime 报警发生起始时间(可选)
+ * @param endTime 报警发生终止时间(可选)
+ * @return true = 命令发送成功
+ */
+ boolean alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime);
+
+ /**
+ * 订阅、取消订阅目录信息
+ * @param device 视频设备
+ * @return true = 命令发送成功
+ */
+ boolean catalogSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent);
+
+ /**
+ * 拉框控制命令
+ *
+ * @param device 控制设备
+ * @param channelId 通道id
+ * @param cmdString 前端控制指令串
+ */
+ boolean dragZoomCmd(Device device, String channelId, String cmdString);
+
+
+ /**
+ * 向设备发送报警NOTIFY消息, 用于互联结构下,此时将设备当成一个平级平台看待
+ * @param device 设备
+ * @param deviceAlarm 报警信息信息
+ * @return
+ */
+ boolean sendAlarmMessage(Device device, DeviceAlarm deviceAlarm);
+}
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 a505d5a6..3e4e31e9 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
@@ -1,1952 +1,1967 @@
-package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.DynamicTask;
-import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.gb28181.bean.*;
-import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
-import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;
-import com.genersoft.iot.vmp.utils.DateUtil;
-import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
-import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
-import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import gov.nist.javax.sip.SipProviderImpl;
-import gov.nist.javax.sip.SipStackImpl;
-import gov.nist.javax.sip.message.MessageFactoryImpl;
-import gov.nist.javax.sip.message.SIPRequest;
-import gov.nist.javax.sip.stack.SIPDialog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import javax.sip.*;
-import javax.sip.address.Address;
-import javax.sip.address.SipURI;
-import javax.sip.address.URI;
-import javax.sip.header.*;
-import javax.sip.message.Request;
-import java.lang.reflect.Field;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * @description:设备能力接口,用于定义设备的控制、查询能力
- * @author: swwheihei
- * @date: 2020年5月3日 下午9:22:48
- */
-@Component
-@DependsOn("sipLayer")
-public class SIPCommander implements ISIPCommander {
-
- private final Logger logger = LoggerFactory.getLogger(SIPCommander.class);
-
- @Autowired
- private SipConfig sipConfig;
-
- @Autowired
- private SipFactory sipFactory;
-
- @Autowired
- @Qualifier(value="tcpSipProvider")
- private SipProviderImpl tcpSipProvider;
-
- @Autowired
- @Qualifier(value="udpSipProvider")
- private SipProviderImpl udpSipProvider;
-
- @Autowired
- private SIPRequestHeaderProvider headerProvider;
-
- @Autowired
- private VideoStreamSessionManager streamSession;
-
- @Autowired
- private IVideoManagerStorage storager;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
- private UserSetting userSetting;
-
- @Autowired
- private ZLMHttpHookSubscribe subscribe;
-
- @Autowired
- private SipSubscribe sipSubscribe;
-
- @Autowired
- private IMediaServerService mediaServerService;
-
- @Autowired
- private DynamicTask dynamicTask;
-
-
- /**
- * 云台方向放控制,使用配置文件中的默认镜头移动速度
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
- * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
- */
- @Override
- public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown) {
- return ptzCmd(device, channelId, leftRight, upDown, 0, sipConfig.getPtzSpeed(), 0);
- }
-
- /**
- * 云台方向放控制
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
- * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
- * @param moveSpeed 镜头移动速度
- */
- @Override
- public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown, int moveSpeed) {
- return ptzCmd(device, channelId, leftRight, upDown, 0, moveSpeed, 0);
- }
-
- /**
- * 云台缩放控制,使用配置文件中的默认镜头缩放速度
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
- */
- @Override
- public boolean ptzZoomCmd(Device device, String channelId, int inOut) {
- return ptzCmd(device, channelId, 0, 0, inOut, 0, sipConfig.getPtzSpeed());
- }
-
- /**
- * 云台缩放控制
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
- * @param zoomSpeed 镜头缩放速度
- */
- @Override
- public boolean ptzZoomCmd(Device device, String channelId, int inOut, int zoomSpeed) {
- return ptzCmd(device, channelId, 0, 0, inOut, 0, zoomSpeed);
- }
-
- /**
- * 云台指令码计算
- *
- * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
- * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
- * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
- * @param moveSpeed 镜头移动速度 默认 0XFF (0-255)
- * @param zoomSpeed 镜头缩放速度 默认 0X1 (0-255)
- */
- public static String cmdString(int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed) {
- int cmdCode = 0;
- if (leftRight == 2) {
- cmdCode|=0x01; // 右移
- } else if(leftRight == 1) {
- cmdCode|=0x02; // 左移
- }
- if (upDown == 2) {
- cmdCode|=0x04; // 下移
- } else if(upDown == 1) {
- cmdCode|=0x08; // 上移
- }
- if (inOut == 2) {
- cmdCode |= 0x10; // 放大
- } else if(inOut == 1) {
- cmdCode |= 0x20; // 缩小
- }
- StringBuilder builder = new StringBuilder("A50F01");
- String strTmp;
- strTmp = String.format("%02X", cmdCode);
- builder.append(strTmp, 0, 2);
- strTmp = String.format("%02X", moveSpeed);
- builder.append(strTmp, 0, 2);
- builder.append(strTmp, 0, 2);
- strTmp = String.format("%X", zoomSpeed);
- builder.append(strTmp, 0, 1).append("0");
- //计算校验码
- int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + moveSpeed + moveSpeed + (zoomSpeed /*<< 4*/ & 0XF0)) % 0X100;
- strTmp = String.format("%02X", checkCode);
- builder.append(strTmp, 0, 2);
- return builder.toString();
-}
-
- /**
- * 云台指令码计算
- *
- * @param cmdCode 指令码
- * @param parameter1 数据1
- * @param parameter2 数据2
- * @param combineCode2 组合码2
- */
- public static String frontEndCmdString(int cmdCode, int parameter1, int parameter2, int combineCode2) {
- StringBuilder builder = new StringBuilder("A50F01");
- String strTmp;
- strTmp = String.format("%02X", cmdCode);
- builder.append(strTmp, 0, 2);
- strTmp = String.format("%02X", parameter1);
- builder.append(strTmp, 0, 2);
- strTmp = String.format("%02X", parameter2);
- builder.append(strTmp, 0, 2);
- strTmp = String.format("%X", combineCode2);
- builder.append(strTmp, 0, 1).append("0");
- //计算校验码
- int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + parameter1 + parameter2 + (combineCode2 & 0XF0)) % 0X100;
- strTmp = String.format("%02X", checkCode);
- builder.append(strTmp, 0, 2);
- return builder.toString();
- }
-
- /**
- * 云台控制,支持方向与缩放控制
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param leftRight 镜头左移右移 0:停止 1:左移 2:右移
- * @param upDown 镜头上移下移 0:停止 1:上移 2:下移
- * @param inOut 镜头放大缩小 0:停止 1:缩小 2:放大
- * @param moveSpeed 镜头移动速度
- * @param zoomSpeed 镜头缩放速度
- */
- @Override
- public boolean ptzCmd(Device device, String channelId, int leftRight, int upDown, int inOut, int moveSpeed,
- int zoomSpeed) {
- try {
- String cmdStr= cmdString(leftRight, upDown, inOut, moveSpeed, zoomSpeed);
- StringBuffer ptzXml = new StringBuffer(200);
- String charset = device.getCharset();
- ptzXml.append("\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("DeviceControl\r\n");
- ptzXml.append("" + (int)((Math.random()*9+1)*100000) + "\r\n");
- ptzXml.append("" + channelId + "\r\n");
- ptzXml.append("" + cmdStr + "\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("5\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("\r\n");
-
- String tm = Long.toString(System.currentTimeMillis());
-
- CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
-
- Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);
-
- transmitRequest(device, request);
- return true;
- } catch (SipException | ParseException | InvalidArgumentException e) {
- e.printStackTrace();
- }
- return false;
- }
-
- /**
- * 前端控制,包括PTZ指令、FI指令、预置位指令、巡航指令、扫描指令和辅助开关指令
- *
- * @param device 控制设备
- * @param channelId 预览通道
- * @param cmdCode 指令码
- * @param parameter1 数据1
- * @param parameter2 数据2
- * @param combineCode2 组合码2
- */
- @Override
- public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) {
- try {
- String cmdStr= frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);
- logger.debug("控制字符串:" + cmdStr);
- StringBuffer ptzXml = new StringBuffer(200);
- String charset = device.getCharset();
- ptzXml.append("\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("DeviceControl\r\n");
- ptzXml.append("" + (int)((Math.random()*9+1)*100000) + "\r\n");
- ptzXml.append("" + channelId + "\r\n");
- ptzXml.append("" + cmdStr + "\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("5\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("\r\n");
-
- String tm = Long.toString(System.currentTimeMillis());
-
- CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
-
- Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);
- transmitRequest(device, request);
- return true;
- } catch (SipException | ParseException | InvalidArgumentException e) {
- e.printStackTrace();
- }
- return false;
- }
-
- /**
- * 前端控制指令(用于转发上级指令)
- * @param device 控制设备
- * @param channelId 预览通道
- * @param cmdString 前端控制指令串
- */
- @Override
- public boolean fronEndCmd(Device device, String channelId, String cmdString, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) {
- try {
- StringBuffer ptzXml = new StringBuffer(200);
- String charset = device.getCharset();
- ptzXml.append("\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("DeviceControl\r\n");
- ptzXml.append("" + (int)((Math.random()*9+1)*100000) + "\r\n");
- ptzXml.append("" + channelId + "\r\n");
- ptzXml.append("" + cmdString + "\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("5\r\n");
- ptzXml.append("\r\n");
- ptzXml.append("\r\n");
-
- String tm = Long.toString(System.currentTimeMillis());
-
- CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
-
- Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);
- transmitRequest(device, request, errorEvent, okEvent);
- return true;
- } catch (SipException | ParseException | InvalidArgumentException e) {
- e.printStackTrace();
- }
- return false;
- }
-
- /**
- * 请求预览视频流
- * @param device 视频设备
- * @param channelId 预览通道
- * @param event hook订阅
- * @param errorEvent sip错误订阅
- */
- @Override
- public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
- ZLMHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {
- String streamId = ssrcInfo.getStream();
- try {
- if (device == null) {
- return;
- }
- String streamMode = device.getStreamMode().toUpperCase();
-
- logger.info("{} 分配的ZLM为: {} [{}:{}]", streamId, mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
- // 添加订阅
- JSONObject subscribeKey = new JSONObject();
- subscribeKey.put("app", "rtp");
- subscribeKey.put("stream", streamId);
- subscribeKey.put("regist", true);
- subscribeKey.put("schema", "rtmp");
- subscribeKey.put("mediaServerId", mediaServerItem.getId());
- subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
- (MediaServerItem mediaServerItemInUse, JSONObject json)->{
- if (event != null) {
- event.response(mediaServerItemInUse, json);
- }
- });
- //
- StringBuffer content = new StringBuffer(200);
- content.append("v=0\r\n");
- content.append("o="+ channelId+" 0 0 IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");
- content.append("s=Play\r\n");
- content.append("c=IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");
- content.append("t=0 0\r\n");
-
- if (userSetting.isSeniorSdp()) {
- if("TCP-PASSIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
- }else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
- }else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" 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 H265/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");
- }
- }else {
- if("TCP-PASSIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
- }else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
- }else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\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");
- content.append("a=rtpmap:99 H265/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("y="+ssrcInfo.getSsrc()+"\r\n");//ssrc
- // f字段:f= v/编码格式/分辨率/帧率/码率类型/码率大小a/编码格式/码率大小/采样率
-// content.append("f=v/2/5/25/1/4000a/1/8/1" + "\r\n"); // 未发现支持此特性的设备
-
- String tm = Long.toString(System.currentTimeMillis());
-
- CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
-
- Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "FromInvt" + tm, null, ssrcInfo.getSsrc(), callIdHeader);
-
- transmitRequest(device, request, (e -> {
- streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
- mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
- errorEvent.response(e);
- }), e ->{
- // 这里为例避免一个通道的点播只有一个callID这个参数使用一个固定值
- streamSession.put(device.getDeviceId(), channelId ,"play", streamId, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction(), VideoStreamSessionManager.SessionType.play);
- streamSession.put(device.getDeviceId(), channelId ,"play", e.dialog);
- okEvent.response(e);
- });
-
-
- } catch ( SipException | ParseException | InvalidArgumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 请求回放视频流
- *
- * @param device 视频设备
- * @param channelId 预览通道
- * @param startTime 开始时间,格式要求:yyyy-MM-dd HH:mm:ss
- * @param endTime 结束时间,格式要求:yyyy-MM-dd HH:mm:ss
- */
- @Override
- public void playbackStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
- String startTime, String endTime, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
- SipSubscribe.Event errorEvent) {
- try {
-
- logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
-
- StringBuffer content = new StringBuffer(200);
- content.append("v=0\r\n");
- content.append("o="+channelId+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
- content.append("s=Playback\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 (userSetting.isSeniorSdp()) {
- if("TCP-PASSIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
- }else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
- }else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" 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 H265/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");
- }
- }else {
- if("TCP-PASSIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
- }else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
- }else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
- }
- content.append("a=recvonly\r\n");
- content.append("a=rtpmap:96 PS/90000\r\n");
- content.append("a=rtpmap:97 MPEG4/90000\r\n");
- content.append("a=rtpmap:98 H264/90000\r\n");
- content.append("a=rtpmap:99 H265/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("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
-
- String tm = Long.toString(System.currentTimeMillis());
-
- CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
-
- // 添加订阅
- JSONObject subscribeKey = new JSONObject();
- subscribeKey.put("app", "rtp");
- subscribeKey.put("stream", ssrcInfo.getStream());
- subscribeKey.put("regist", true);
- subscribeKey.put("schema", "rtmp");
- subscribeKey.put("mediaServerId", mediaServerItem.getId());
- logger.debug("录像回放添加订阅,订阅内容:" + subscribeKey);
- subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
- (MediaServerItem mediaServerItemInUse, JSONObject json)->{
- if (hookEvent != null) {
- InviteStreamInfo inviteStreamInfo = new InviteStreamInfo(mediaServerItemInUse, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream());
- hookEvent.call(inviteStreamInfo);
- }
- });
- Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());
-
- transmitRequest(device, request, errorEvent, okEvent -> {
- ResponseEvent responseEvent = (ResponseEvent) okEvent.event;
- streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction(), VideoStreamSessionManager.SessionType.playback);
- streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), okEvent.dialog);
- });
- if (inviteStreamCallback != null) {
- inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));
- }
- } catch ( SipException | ParseException | InvalidArgumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 请求历史媒体下载
- *
- * @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(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
- String startTime, String endTime, int downloadSpeed, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
- SipSubscribe.Event errorEvent) {
- try {
- logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
-
- StringBuffer content = new StringBuffer(200);
- content.append("v=0\r\n");
- content.append("o="+channelId+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\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 (userSetting.isSeniorSdp()) {
- if("TCP-PASSIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
- }else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
- }else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" 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 "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
- }else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
- }else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
- }
- content.append("a=recvonly\r\n");
- content.append("a=rtpmap:96 PS/90000\r\n");
- content.append("a=rtpmap:97 MPEG4/90000\r\n");
- content.append("a=rtpmap:98 H264/90000\r\n");
- content.append("a=rtpmap:99 H265/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=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
-
- String tm = Long.toString(System.currentTimeMillis());
-
- CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
-
- // 添加订阅
- JSONObject subscribeKey = new JSONObject();
- subscribeKey.put("app", "rtp");
- subscribeKey.put("stream", ssrcInfo.getStream());
- subscribeKey.put("regist", true);
- subscribeKey.put("mediaServerId", mediaServerItem.getId());
- logger.debug("录像回放添加订阅,订阅内容:" + subscribeKey.toString());
- subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
- (MediaServerItem mediaServerItemInUse, JSONObject json)->{
- hookEvent.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));
- subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);
- subscribeKey.put("regist", false);
- subscribeKey.put("schema", "rtmp");
- // 添加流注销的订阅,注销了后向设备发送bye
- subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
- (MediaServerItem mediaServerItemForEnd, JSONObject jsonForEnd)->{
- ClientTransaction transaction = streamSession.getTransaction(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
- if (transaction != null) {
- logger.info("[录像]下载结束, 发送BYE");
- streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
- }
- });
- });
-
- Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());
- if (inviteStreamCallback != null) {
- inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));
- }
- transmitRequest(device, request, errorEvent, okEvent->{
- ResponseEvent responseEvent = (ResponseEvent) okEvent.event;
- streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction(), VideoStreamSessionManager.SessionType.download);
- streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), okEvent.dialog);
- });
-
-
- } catch ( SipException | ParseException | InvalidArgumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 视频流停止, 不使用回调
- */
- @Override
- public void streamByeCmd(String deviceId, String channelId, String stream, String callId) {
- streamByeCmd(deviceId, channelId, stream, callId, null);
- }
-
- /**
- * 视频流停止
- */
- @Override
- public void streamByeCmd(String deviceId, String channelId, String stream, String callId, SipSubscribe.Event okEvent) {
- try {
- SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, callId, stream);
- ClientTransaction transaction = streamSession.getTransaction(deviceId, channelId, stream, callId);
-
- if (transaction == null ) {
- logger.warn("[ {} -> {}]停止视频流的时候发现事务已丢失", deviceId, channelId);
- SipSubscribe.EventResult