panlinlin
|
44521509d7
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-08 15:40:46 +08:00 |
|
panlinlin
|
3aeb164c8d
|
添加对水星云台控制的支持
|
2021-01-08 13:33:19 +08:00 |
|
panlinlin
|
29c52dbdda
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 15:31:16 +08:00 |
|
panlinlin
|
4ed02aa69b
|
完成向上级联->删除的时候注销
|
2021-01-07 13:15:39 +08:00 |
|
panlinlin
|
a8a36efb93
|
完成向上级联->保活
|
2021-01-06 18:35:38 +08:00 |
|
panlinlin
|
80682bbe9d
|
修改错误的注释
|
2021-01-06 10:01:28 +08:00 |
|
panlinlin
|
20669ed768
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
# README.md
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
# src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
# src/main/resources/application-dev.yml
# web_src/src/components/gb28181/devicePlayer.vue
|
2021-01-05 15:56:19 +08:00 |
|
panlinlin
|
3a6fc34a11
|
优化录像查询，优化注释
|
2021-01-05 14:35:43 +08:00 |
|
panlinlin
|
b88ead03f9
|
存储部分使用sqlite代替redis-4
|
2021-01-05 11:25:05 +08:00 |
|
panlinlin
|
82c682c512
|
存储部分使用sqlite代替redis-3
|
2021-01-04 18:30:44 +08:00 |
|
panlinlin
|
2ab8b942bd
|
存储部分使用sqlite代替redis
|
2020-12-31 13:15:50 +08:00 |
|
panlinlin
|
59f7fb1063
|
增加对 需要扩展SDP的设备的单独设置
|
2020-12-28 11:45:40 +08:00 |
|
panlinlin
|
098307cfe8
|
检查设备是否存在， 不存在则不回复心跳
|
2020-12-28 11:07:01 +08:00 |
|
panlinlin
|
27c0332052
|
修复空指针异常
|
2020-12-27 08:19:34 +08:00 |
|
panlinlin
|
071c2de9b8
|
兼容水星IPC的录像查询
|
2020-12-26 20:08:04 +08:00 |
|
panlinlin
|
e4d849304c
|
增加对水星IPC的兼容
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
|
2020-12-26 16:44:27 +08:00 |
|
panlinlin
|
64aae8db3b
|
修复录像查询的VIA头
|
2020-12-25 15:27:25 +08:00 |
|
panlinlin
|
a2ac3c77dd
|
修复空指针
|
2020-12-25 15:05:55 +08:00 |
|
648540858
|
762507def6
|
替换线程不安全的map
|
2020-12-22 09:48:51 +08:00 |
|
648540858
|
c8fd03682a
|
补充漏掉的文件
|
2020-12-21 16:01:47 +08:00 |
|
648540858
|
a742be7afe
|
修复重复调用open rtp server 的bug
增加对rtp server开启释放的统一管理
|
2020-12-21 15:29:17 +08:00 |
|
648540858
|
51630f54e8
|
修复兼容接口
|
2020-12-21 11:13:27 +08:00 |
|
panlinlin
|
82cceb6a4b
|
去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播
|
2020-12-19 21:52:20 +08:00 |
|
Lawrence
|
4fe7f7fe2e
|
上级注册Expires值根据填表值发送
|
2020-12-18 00:43:17 +08:00 |
|
Lawrence
|
e9360b423e
|
解决编译为jar后运行报循环依赖错误的问题
|
2020-12-17 22:37:45 +08:00 |
|
Lawrence
|
ef242dc164
|
注册过程中区分不同的CSeq值
|
2020-12-17 14:47:56 +08:00 |
|
Lawrence
|
0cd769e3da
|
注册信令包增加Expires头，修改CSeq值
|
2020-12-17 14:46:38 +08:00 |
|
Lawrence
|
4aecbd8197
|
添加回放SDP信息，兼容海康设备
|
2020-12-16 20:36:59 +08:00 |
|
Lawrence
|
7b5fe25b96
|
与master分支同步
|
2020-12-16 20:29:19 +08:00 |
|
Lawrence
|
b9c2a7c888
|
去掉重复添加的via头
|
2020-12-16 12:42:36 +08:00 |
|
Lawrence
|
2852561e50
|
临时修改解决内网Ack问题
|
2020-12-14 22:42:28 +08:00 |
|
Lawrence
|
685e2073f4
|
扩展点播SDP协议范围，兼容海康等设备（issue #7）
|
2020-12-14 22:35:40 +08:00 |
|
648540858
|
fe04126415
|
使用线程安全的map存储订阅信息
修改点播消息内容,提升兼容性
|
2020-12-14 16:51:29 +08:00 |
|
648540858
|
d8faf83c9d
|
精简代码
|
2020-12-14 15:34:33 +08:00 |
|
648540858
|
2bfef8ab6c
|
修改错误注释和错误日志
|
2020-12-14 15:11:48 +08:00 |
|
648540858
|
726730cbaa
|
使用异步接口, 更好的并发, 对hook使用订阅机制
替换前段播放器, 支持h265的播放
放弃循环获取编码信息,
|
2020-12-08 18:11:02 +08:00 |
|
648540858
|
9240401b86
|
使用APPLICATION 替换 Application
|
2020-11-30 17:02:44 +08:00 |
|
648540858
|
45b2720295
|
更新注释
|
2020-11-25 11:49:10 +08:00 |
|
648540858
|
3e041b1bba
|
增加对部分NVR的兼容性处理
|
2020-11-25 11:42:51 +08:00 |
|
648540858
|
a96d22701e
|
完成向上级联->注册
|
2020-11-24 16:41:00 +08:00 |
|
648540858
|
ae786534c6
|
[UI] 完成国标级联的CURD
|
2020-11-23 18:17:20 +08:00 |
|
648540858
|
51ff7ae180
|
添加addParentPlatform, queryParentPlatformList 接口
|
2020-11-20 18:02:01 +08:00 |
|
648540858
|
8e2adfc948
|
修复一些日志设置
|
2020-11-17 15:27:13 +08:00 |
|
Lawrence
|
0112db1e1a
|
改正xml空字段转换为数字的错误
|
2020-11-16 17:05:22 +08:00 |
|
Lawrence
|
fcfd34e00d
|
修正处理Catalog信息时遇到空字段的错误
|
2020-11-16 12:37:38 +08:00 |
|
648540858
|
028e656f56
|
去除无效注解
修复获取sn错误的bug
|
2020-11-13 09:55:24 +08:00 |
|
Lawrence
|
070490e18a
|
增加录像回放结束后对设备发出的MediaStatus的回应并关流
|
2020-11-13 09:28:51 +08:00 |
|
648540858
|
50c7fa74ca
|
修复录象回放的bug
|
2020-11-09 19:45:04 +08:00 |
|
Lawrence
|
c74e6ba5d6
|
修正针对部分设备无录像时不返回RecordInfo段而长时间等待的bug
|
2020-11-09 18:40:13 +08:00 |
|
648540858
|
88967428da
|
支持公网部署
|
2020-11-09 13:33:00 +08:00 |
|