panlinlin
|
b4a7cfb563
|
完成向上级联->选择通道-001
|
2021-01-08 11:04:29 +08:00 |
|
panlinlin
|
2383f1515f
|
完成向上级联->选择通道-001
|
2021-01-08 11:02:53 +08:00 |
|
panlinlin
|
71a1dd8fc6
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 16:52:18 +08:00 |
|
panlinlin
|
a3afe9cc34
|
增加云台控制的速度控制
|
2021-01-07 16:44:42 +08:00 |
|
panlinlin
|
a8a36efb93
|
完成向上级联->保活
|
2021-01-06 18:35:38 +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
|
e4d849304c
|
增加对水星IPC的兼容
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
|
2020-12-26 16:44:27 +08:00 |
|
648540858
|
c8fd03682a
|
补充漏掉的文件
|
2020-12-21 16:01:47 +08:00 |
|
panlinlin
|
82cceb6a4b
|
去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播
|
2020-12-19 21:52:20 +08:00 |
|
Lawrence
|
bf62eb1177
|
新建上级级联平台时自动填入本级平台参数
|
2020-12-17 14:50:49 +08:00 |
|
Lawrence
|
7b5fe25b96
|
与master分支同步
|
2020-12-16 20:29:19 +08:00 |
|
Lawrence
|
a76b464cd4
|
修正播放窗口关闭时销毁播放器的代码
|
2020-12-16 12:51:57 +08:00 |
|
Lawrence
|
f804dbfa34
|
修正转码播放停止后重复回调的错误
|
2020-12-16 12:41:49 +08:00 |
|
648540858
|
726730cbaa
|
使用异步接口, 更好的并发, 对hook使用订阅机制
替换前段播放器, 支持h265的播放
放弃循环获取编码信息,
|
2020-12-08 18:11:02 +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
|
ba5ac5e8c1
|
添加自动通道刷新
|
2020-11-19 16:11:13 +08:00 |
|
648540858
|
17772daaaf
|
添加网页自动转码,以支持h265 g.711的播放
|
2020-11-19 16:00:02 +08:00 |
|
648540858
|
73fd076830
|
修复停止点播后,再次调用停止无法识别
|
2020-11-16 17:24:20 +08:00 |
|
Lawrence
|
e4920aeb20
|
修正不同终端开关音频设置不同引起播放问题的bug
|
2020-11-09 18:44:35 +08:00 |
|
Lawrence
|
411eea780a
|
改为24小时制显示
|
2020-11-09 18:42:59 +08:00 |
|
Lawrence
|
84611d7c4f
|
优化播放程序，缩短播放加载时间
|
2020-11-07 16:54:42 +08:00 |
|
Lawrence
|
32a7c12f82
|
完善前端控制信令，实现GB28181 A.3前端设备控制协议
|
2020-11-06 12:37:08 +08:00 |
|
Lawrence
|
5909578c41
|
录像查询更换日期后先清空原先的查询列表
|
2020-10-29 10:23:10 +08:00 |
|
648540858
|
021ba73002
|
修复ui录象播放
优化录象查询接口
|
2020-10-26 11:40:46 +08:00 |
|
Lawrence
|
c01acd3175
|
具有子节点的通道保留播放按钮，避免部分NVR无法查看直播流
|
2020-10-24 15:18:48 +08:00 |
|
Lawrence
|
b6e99efb55
|
使音频开关关闭生效
|
2020-10-24 15:16:10 +08:00 |
|
Lawrence
|
203888f306
|
修正音频编码判断代码错误，仅当存在AAC音轨时打开音频
|
2020-10-19 20:37:02 +08:00 |
|
Lawrence
|
535fbe982c
|
突出返回按钮
|
2020-10-19 20:35:01 +08:00 |
|
648540858
|
8369c616d2
|
修复ui开启音频无法播放的bug
修复可能导致录象查看的bug
修复开启openRTPServer时的bug
|
2020-10-19 14:25:41 +08:00 |
|
648540858
|
648853f18a
|
去除lombok框架
添加流传输模式udp/tcp被动支持
|
2020-10-16 16:49:41 +08:00 |
|
648540858
|
fd1dafc4a6
|
去除lombok框架
|
2020-10-16 14:57:10 +08:00 |
|
648540858
|
67764bedaf
|
修复点播判断错误导致的15s超长延时
增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流
修复点播其他bug
|
2020-10-14 14:39:10 +08:00 |
|
648540858
|
cb45d84b94
|
修复无音频通道开启通道音频后无法播放的bug
修复点播接口真的收到视频后回复
|
2020-10-13 18:55:42 +08:00 |
|
648540858
|
79ee1e087f
|
添加通道音频设置
添加media配置
|
2020-10-13 17:16:38 +08:00 |
|
648540858
|
c7270f9320
|
离在线状态样式修改
修复未回复200ok导致catalog一直发送的bug
修改点播接口未收到视频后回复
|
2020-10-13 14:46:47 +08:00 |
|
648540858
|
bce4e95482
|
修复子节点显示错误
|
2020-10-12 10:11:24 +08:00 |
|
648540858
|
f321337c69
|
web页面集成
|
2020-10-10 17:33:29 +08:00 |
|
648540858
|
1d3efd3c49
|
web页面集成
|
2020-10-10 17:33:02 +08:00 |
|