panlinlin
|
34135cce5d
|
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
|
dcd78a1cfa
|
存储部分使用sqlite代替redis-3
|
2021-01-04 18:30:44 +08:00 |
|
panlinlin
|
3d83775468
|
存储部分使用sqlite代替redis
|
2020-12-31 13:15:50 +08:00 |
|
panlinlin
|
b0080159d9
|
去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播
|
2020-12-19 21:52:20 +08:00 |
|
648540858
|
14003b9805
|
[UI] 完成国标级联的CURD
|
2020-11-23 18:17:20 +08:00 |
|
648540858
|
1904978856
|
添加addParentPlatform, queryParentPlatformList 接口
|
2020-11-20 18:02:01 +08:00 |
|
648540858
|
9361943e47
|
修复ui录象播放
优化录象查询接口
|
2020-10-26 11:40:46 +08:00 |
|
648540858
|
4d9a62339d
|
去除lombok框架
添加流传输模式udp/tcp被动支持
|
2020-10-16 16:49:41 +08:00 |
|
648540858
|
cc61ed4a07
|
去除lombok框架
|
2020-10-16 14:57:10 +08:00 |
|
648540858
|
1947edb69a
|
引入lombok框架
优化redis存储结构
|
2020-10-16 11:24:36 +08:00 |
|
648540858
|
3ec3b88456
|
修复点播判断错误导致的15s超长延时
增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流
修复点播其他bug
|
2020-10-14 14:39:10 +08:00 |
|
648540858
|
f9ab13a145
|
添加通道音频设置
添加media配置
|
2020-10-13 17:16:38 +08:00 |
|
648540858
|
d881c98224
|
web页面集成
|
2020-10-10 17:33:02 +08:00 |
|
648540858
|
57fd18cd7c
|
增加分页,搜索,等
|
2020-09-30 17:59:11 +08:00 |
|
648540858
|
da14c7f24c
|
拆分redis中device与channel的存储方式
支持分页
接口直接返回播放地址
|
2020-09-25 17:22:22 +08:00 |
|
swwheihei
|
d8eeb70707
|
改名
|
2020-07-16 16:10:49 +08:00 |
|
songww
|
3a502b36a8
|
完善ssrc符合国标，并完善很多小问题
|
2020-05-10 22:33:21 +08:00 |
|
songww
|
bf7ab3fe2b
|
优化代码结构，提供NVR录像检索接口
|
2020-05-08 21:57:07 +08:00 |
|
songww
|
70091f29f2
|
初始提交
|
2020-05-07 21:55:45 +08:00 |
|