Commit Graph

1748 Commits

Author SHA1 Message Date
648540858
ae239c8848 Merge branch 'master' into 1078 2024-04-08 18:15:06 +08:00
648540858
9badf1c7fe 1078-添加位置附加信息定义 2024-04-08 18:15:02 +08:00
648540858
a890b62fa1 Merge branch '2.7.0' 2024-04-08 18:13:33 +08:00
648540858
48351c875e 国标级联支持制定200OK中sdp的IP 2024-04-08 18:13:15 +08:00
648540858
d54787f323 1078-添加读取位置信息汇报附加信息读取 2024-04-07 23:50:58 +08:00
648540858
8a2dc6031e 1078-实现云台控制接口 2024-04-07 22:06:41 +08:00
648540858
9255ea802f 1078-添加云台控制接口 2024-04-07 20:59:21 +08:00
648540858
349b0442d6 Merge remote-tracking branch 'origin/1078' into 1078 2024-04-07 20:42:32 +08:00
648540858
403eb4499d Merge branch 'master' into 1078 2024-04-07 20:42:10 +08:00
648540858
7d0aebd311 Merge branch '2.7.0' 2024-04-07 20:26:01 +08:00
648540858
aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858
7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858
6757f4b719 1078-云台变倍控制 2024-04-07 07:21:21 +08:00
648540858
8ba30e83ef 1078-修复错别字 2024-04-07 07:19:02 +08:00
648540858
98d9eb5314 1078-添加云台红外补光控制 2024-04-07 07:17:35 +08:00
648540858
a8a4aecc15 1078-添加云台雨刷控制 2024-04-07 07:15:43 +08:00
648540858
b649464753 1078-添加云台光圈控制 2024-04-07 07:12:51 +08:00
648540858
ebdd9ab534 1078-添加云台焦距控制 2024-04-07 07:09:49 +08:00
648540858
a1ab834875 1078-添加云台旋转 2024-04-07 07:07:27 +08:00
648540858
4ec4d618d6 1078-添加文件上传控制 2024-04-07 07:02:06 +08:00
648540858
5fc1000fcc 1078-添加文件上传完成通知 2024-04-07 06:56:39 +08:00
648540858
302eb98d51 1078-添加文件上传指令 2024-04-07 06:44:52 +08:00
648540858
984d8743be 1078-优化录像回放开始和停止 2024-04-06 00:42:54 +08:00
648540858
26bbeac6c7 1078-添加录像回放开始和停止 2024-04-06 00:06:40 +08:00
648540858
81c2b5715c 1078-添加录像回放列表查询 2024-04-04 16:54:08 +08:00
648540858
3e5da98539 1078-支持点播暂停/继续 2024-04-04 07:19:46 +08:00
648540858
a7b7371e74 1078-增加结束点播 2024-04-03 18:00:48 +08:00
648540858
0f420c43ac 1078-优化点播 2024-04-03 16:59:33 +08:00
648540858
abc3766556 1078-优化点播 2024-04-03 16:33:49 +08:00
648540858
603ce18573 1078-添加点播支持 2024-04-02 23:26:40 +08:00
648540858
6acc395ad2 Merge branch 'master' into 1078 2024-04-02 18:33:53 +08:00
648540858
67688d4a4b 优化停止国标收流 2024-04-02 11:20:19 +08:00
648540858
2738750c3e 移除失效的服务 2024-04-01 09:11:56 +08:00
648540858
486daf4dfe 调整看守位控制接口 2024-03-29 19:18:34 +08:00
648540858
cf3d98102a Merge branch 'master' into 2.7.0 2024-03-28 18:08:57 +08:00
648540858
1de344674a 使用冒号分隔redis的key 2024-03-28 18:08:33 +08:00
648540858
53d4d10e1c Merge branch 'master' into 2.7.0 2024-03-28 16:31:08 +08:00
648540858
f1e902af7f 支持级联移动位置订阅通知转发 2024-03-28 16:28:41 +08:00
648540858
39103e53c7 修复点播请求释放的问题 2024-03-27 18:23:22 +08:00
648540858
a2b1065fe9 修复redis推流设备推送bug 2024-03-27 16:51:02 +08:00
648540858
0f18d4cbe1 修复redis推流设备推送bug 2024-03-27 16:20:46 +08:00
648540858
e886aa4833 修复PTZType导致声音开关失效的问题 2024-03-27 11:15:35 +08:00
648540858
1aa347bd2b zlm hook 优化 2024-03-22 14:28:00 +08:00
648540858
3291c4b2e6 修复多平台推流无人观看redis通知 2024-03-21 16:54:44 +08:00
648540858
912c83dfd3 添加日志 2024-03-21 11:16:31 +08:00
648540858
97dc926b28 调整ptzType字段名称 2024-03-18 17:41:49 +08:00
648540858
bfafe45b26 Merge pull request #1371 from ancienter/develop
[bugfix]修复云端录像查询时间转换错误的问题
2024-03-18 15:39:32 +08:00
648540858
f4e41659d8 修复国标级联注册和心跳重复发送的问题 2024-03-18 10:36:15 +08:00
648540858
c6adfd24d9 修复redis开始推流的通知 2024-03-18 10:13:03 +08:00
648540858
da33471dfd 1078-修改9101编码为GBK 2024-03-17 23:45:08 +08:00