Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
414 Commits 2 Branches 0 Tags 42 MiB
2b1e56973e
Commit Graph

24 Commits

Author SHA1 Message Date
panlinlin
b17280522b 增加推流转发到国标，尚不完善 2021-04-02 19:04:01 +08:00
panlinlin
7dc8fd4a1e 添加拉流代理与国标关联, 支持代理rtsp/rtmp/...，转发到国标 2021-04-01 18:06:21 +08:00
panlinlin
edb033ccd7 添加获取直播流的api 2021-03-26 18:32:36 +08:00
panlinlin
2f165d595a 对级联点播信令进行处理 2021-03-02 18:23:06 +08:00
panlinlin
0f58218bad Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	README.md
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.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/impl/VideoManagerStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/resources/wvp.sqlite
#	web_src/.postcssrc.js
#	web_src/src/components/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js
 2021-02-25 18:10:02 +08:00
lawrencehj
a8603075d4 去除冗余代码，修正编译报警项 2021-02-05 15:15:39 +08:00
panlinlin
503f891c9e 完成向上级联->点播--增加了sdp解析 
修复修改平台主键带来的bug
 2021-01-15 17:21:02 +08:00
panlinlin
7e581e9d3a Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
 2021-01-08 17:31:49 +08:00
panlinlin
1342aad032 修复检测字段是否存在带来的停止按钮无法点击 
修改错别字
 2021-01-08 17:27:13 +08:00
panlinlin
627a14f37e 完成向上级联->保活 2021-01-06 18:35:38 +08:00
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
b0080159d9 去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播 2020-12-19 21:52:20 +08:00
Lawrence
44d216100b 与master分支同步 2020-12-16 20:29:19 +08:00
648540858
f75b3e6cda 使用异步接口, 更好的并发, 对hook使用订阅机制 
替换前段播放器, 支持h265的播放
放弃循环获取编码信息,
 2020-12-08 18:11:02 +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
1947edb69a 引入lombok框架 
优化redis存储结构
 2020-10-16 11:24:36 +08:00
648540858
fbdad00cdb 修复无音频通道开启通道音频后无法播放的bug 
修复点播接口真的收到视频后回复
 2020-10-13 18:55:42 +08:00
648540858
d4ae8194eb 离在线状态样式修改 
修复未回复200ok导致catalog一直发送的bug
修改点播接口未收到视频后回复
 2020-10-13 14:46:47 +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
70091f29f2 初始提交 2020-05-07 21:55:45 +08:00