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
|
4 years ago |
|
panlinlin
|
730a64be07
|
优化录像查询，优化注释
|
4 years ago |
|
panlinlin
|
5ef229f02c
|
更新application.yml
|
4 years ago |
|
panlinlin
|
70fca8ce5d
|
更新readme
|
4 years ago |
|
panlinlin
|
381e3129a3
|
存储部分使用sqlite代替redis-4
|
4 years ago |
|
panlinlin
|
dcd78a1cfa
|
存储部分使用sqlite代替redis-3
|
4 years ago |
|
panlinlin
|
a25f7e4f99
|
存储部分使用sqlite代替redis-2
|
4 years ago |
|
panlinlin
|
3d83775468
|
存储部分使用sqlite代替redis
|
4 years ago |
|
panlinlin
|
00e61d9a80
|
增加对 需要扩展SDP的设备的单独设置
|
4 years ago |
|
panlinlin
|
48896474e6
|
检查设备是否存在， 不存在则不回复心跳
|
4 years ago |
|
panlinlin
|
6968839f21
|
修复空指针异常
|
4 years ago |
|
panlinlin
|
418e441dfc
|
兼容水星IPC的录像查询
|
4 years ago |
|
panlinlin
|
f2279859b3
|
增加对水星IPC的兼容
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
|
4 years ago |
|
panlinlin
|
17f4fe254a
|
增加对配置文件的校验
|
4 years ago |
|
panlinlin
|
642d93c061
|
修复录像查询的VIA头
|
4 years ago |
|
panlinlin
|
d178c28317
|
修复空指针
|
4 years ago |
|
648540858
|
ae32f978f6
|
添加maven源, 增加依赖下载速度
|
4 years ago |
|
648540858
|
8d2ad02208
|
替换线程不安全的map
|
4 years ago |
|
648540858
|
000bbad21e
|
恢复配置文件
|
4 years ago |
|
648540858
|
b5c9de775d
|
补充漏掉的文件
|
4 years ago |
|
648540858
|
bfd1628d5b
|
修复重复调用open rtp server 的bug
增加对rtp server开启释放的统一管理
|
4 years ago |
|
648540858
|
1ec6c4506a
|
修复重复调用open rtp server
|
4 years ago |
|
648540858
|
d58064587d
|
修复兼容接口
|
4 years ago |
|
panlinlin
|
cebea64d36
|
update readme
|
4 years ago |
|
panlinlin
|
b0080159d9
|
去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播
|
4 years ago |
|
648540858
|
a63ae08f5d
|
Merge pull request #15 from lawrencehj/wvp-28181-2.0
修复编译后运行报错“循环依赖”的问题，修复zlm在docker时代理错误
|
4 years ago |
|
Lawrence
|
28d17b04b1
|
上级注册Expires值根据填表值发送
|
4 years ago |
|
Lawrence
|
ae336ae494
|
解决编译为jar后运行报循环依赖错误的问题
|
4 years ago |
|
Lawrence
|
ed1fe4b938
|
与主线同步，修复zlm在docker时代理错误
|
4 years ago |
|
648540858
|
bc2e5e7a37
|
Merge pull request #14 from lawrencehj/wvp-28181-2.0
修正上级注册的代码
|
4 years ago |
|
Lawrence
|
273ece96b5
|
新建上级级联平台时自动填入本级平台参数
|
4 years ago |
|
Lawrence
|
8a82a71ded
|
增加本平台配置查询接口，方便上级级联参数填写
|
4 years ago |
|
Lawrence
|
87ce22e031
|
注册过程中区分不同的CSeq值
|
4 years ago |
|
Lawrence
|
5cecb10b00
|
注册信令包增加Expires头，修改CSeq值
|
4 years ago |
|
648540858
|
0188ffd19f
|
修复zlm在 docker时代理错误
|
4 years ago |
|
648540858
|
288059eecd
|
Merge pull request #12 from lawrencehj/master
修正转码播放重复回调的错误
|
4 years ago |
|
648540858
|
38bf8d6a6c
|
Merge pull request #13 from lawrencehj/wvp-28181-2.0
与master分支同步
|
4 years ago |
|
Lawrence
|
9c9ca9123a
|
添加回放SDP信息，兼容海康设备
|
4 years ago |
|
Lawrence
|
44d216100b
|
与master分支同步
|
4 years ago |
|
Lawrence
|
f4ef375835
|
修正播放窗口关闭时销毁播放器的代码
|
4 years ago |
|
Lawrence
|
b2fa4608a2
|
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
Lawrence
|
ef9b2af018
|
去掉重复添加的via头
|
4 years ago |
|
Lawrence
|
c1204f6615
|
修正转码播放停止后重复回调的错误
|
4 years ago |
|
648540858
|
b6688baef1
|
Merge pull request #10 from lawrencehj/master
解决海康设备兼容问题等
|
4 years ago |
|
Lawrence
|
e56fcc48e1
|
临时修改解决内网Ack问题
|
4 years ago |
|
Lawrence
|
73f2c89d13
|
修改查询录像回放接口，兼容部分设备发出MediaStatus信息时将ChannelId当作DeviceId的问题
|
4 years ago |
|
Lawrence
|
f00d6863cf
|
扩展点播SDP协议范围，兼容海康等设备（issue #7）
|
4 years ago |
|
648540858
|
3d2aeb890b
|
使用线程安全的map存储订阅信息
修改点播消息内容,提升兼容性
|
4 years ago |
|
648540858
|
1a827a4dd4
|
精简代码
|
4 years ago |
|
648540858
|
285f08fc3b
|
修改错误注释和错误日志
|
4 years ago |
