648540858
|
457c5e3821
|
修复拉流代理无人观看自动停用失败
|
2023-07-04 11:10:17 +08:00 |
|
648540858
|
43ef195543
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-03 16:54:09 +08:00 |
|
648540858
|
e4622d17a6
|
优化字段名称
|
2023-07-03 10:36:02 +08:00 |
|
648540858
|
01bc6c857e
|
Merge pull request #908 from cnless/wvp-28181-2.0
fix:修复ResponseBody未关闭以及点播超时报错AsyncRequestTimeoutException
|
2023-07-01 23:04:39 +08:00 |
|
648540858
|
b64f320805
|
优化发流逻辑
|
2023-07-01 18:10:33 +08:00 |
|
648540858
|
0592fd676f
|
修复使用推流状态作为推流通道状态为false仍然发送通知
|
2023-06-29 11:22:32 +08:00 |
|
648540858
|
f62bf7b2c6
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
|
2023-06-29 09:52:05 +08:00 |
|
648540858
|
def56793ba
|
增加上级推流和停止推流的通知
|
2023-06-28 16:52:27 +08:00 |
|
648540858
|
a77628e875
|
优化端口预占用，防止占用无法释放
|
2023-06-28 14:50:46 +08:00 |
|
648540858
|
724963324a
|
修复上级点播时如果推流信息中mediaServerID错误的情况
|
2023-06-26 19:06:14 +08:00 |
|
dsk
|
cec266d3cd
|
修复请求报错404等情况下导致ResponseBody未关闭的问题
|
2023-06-25 16:00:37 +08:00 |
|
648540858
|
155838ce2e
|
优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895
|
2023-06-22 22:35:35 +08:00 |
|
648540858
|
7b24d51db9
|
优化国标级联的端口保持
|
2023-06-21 14:03:31 +08:00 |
|
‘sxh’
|
ccc0a99d68
|
同步主线的代码，保持一致性
|
2023-06-15 11:20:43 +08:00 |
|
‘sxh’
|
652489b47e
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2023-06-15 11:10:20 +08:00 |
|
‘sxh’
|
15df08964b
|
新增设备主子码流选择，默认为不开启
|
2023-06-15 11:00:29 +08:00 |
|
648540858
|
e68eb850a9
|
去除多余日志
|
2023-06-13 23:11:56 +08:00 |
|
648540858
|
c4d7dd9651
|
Merge branch '2.6.8' into wvp-28181-2.0
|
2023-06-13 23:11:00 +08:00 |
|
648540858
|
8f5bbfa5c2
|
修复zlm上线时过期任务设置错误
|
2023-06-13 23:06:35 +08:00 |
|
648540858
|
03f3598681
|
修复stream-on-demand配置失效的BUG
|
2023-06-08 22:46:07 +08:00 |
|
648540858
|
b7f2a6b25b
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
|
2023-06-07 20:21:10 +08:00 |
|
648540858
|
97b04c4dba
|
修复录像下载，优化拉流代理接口
|
2023-06-07 20:15:08 +08:00 |
|
648540858
|
2ef4111297
|
修复拉流代理的ffmpeg代理方式
|
2023-06-05 10:28:11 +08:00 |
|
yanggs
|
51c19c397d
|
修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms"
|
2023-06-01 13:30:48 +08:00 |
|
648540858
|
5a152791c0
|
添加获取截图接口
|
2023-05-29 23:28:06 +08:00 |
|
648540858
|
807d0524a6
|
修复推流鉴权
|
2023-05-23 10:34:00 +08:00 |
|
648540858
|
d849352441
|
重构以适配postgresql
|
2023-05-12 10:37:03 +08:00 |
|
648540858
|
a2da81f79a
|
支持级联国标录像下载
|
2023-05-09 17:31:58 +08:00 |
|
648540858
|
affbd89fdb
|
修复hook订阅移除失败的问题
|
2023-05-08 17:55:07 +08:00 |
|
648540858
|
c429a34e53
|
修复国标视频点播三种级联并发点播和录像下载的问题
|
2023-05-08 17:18:08 +08:00 |
|
648540858
|
e2f9ee8f7b
|
修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题
|
2023-05-06 17:40:57 +08:00 |
|
648540858
|
2bc2842224
|
优化国标点播下级平台，ssrc更新的时因为旧的端口释放慢导致点播失败的问题，使用新的接口直接更新ssrc
|
2023-05-04 15:36:04 +08:00 |
|
648540858
|
3fe47021b9
|
优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性
|
2023-05-04 14:21:58 +08:00 |
|
648540858
|
b944f8867c
|
支持推流和拉流代理通道状态变化发送通知
|
2023-04-23 15:54:34 +08:00 |
|
648540858
|
0f3898910c
|
收流时设置re_use_port参数解决端口关闭快速打开造成的端口未释放问题， 支持点播的tcp主动
|
2023-04-19 16:21:28 +08:00 |
|
648540858
|
f68f6d20e0
|
修复流注销想上级发送bye后未清理缓存的问题
|
2023-04-19 14:53:06 +08:00 |
|
648540858
|
d46fc9de82
|
优化下级平台自定义ssrc的情况，优化国标录像下载流程
|
2023-04-14 14:59:22 +08:00 |
|
648540858
|
5c5699ae11
|
redis优化
|
2023-04-13 17:14:04 +08:00 |
|
648540858
|
403f1e16a3
|
合并优化ssrc存储结构
|
2023-04-08 15:36:59 +08:00 |
|
648540858
|
8c4922cbe1
|
Merge branch '2.6.7' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-04-08 15:29:15 +08:00 |
|
648540858
|
0858f7995b
|
优化ssrc存储结构，避免因为大量ssrc存在MediaServer中导致redis读取超时
|
2023-04-08 15:22:18 +08:00 |
|
648540858
|
91bfbc36f1
|
优化设备注册，支持到期续订，优化国标级联到期续订。
|
2023-03-28 14:09:41 +08:00 |
|
648540858
|
3b1516afe5
|
优化录像配置。不再使用zlm默认的http服务器
|
2023-03-25 18:40:29 +08:00 |
|
xiaoQQya
|
713aa00acc
|
perf(snap): 优化点播成功后截图使用 rtsp 流, 新增对 H265 编码视频截图的支持
|
2023-03-22 15:21:22 +08:00 |
|
648540858
|
c3ce2bc5d0
|
优化异常处理以及级联设备状态查询
|
2023-03-17 13:22:05 +08:00 |
|
648540858
|
72b9239c5a
|
优化消息通道
|
2023-03-16 20:32:22 +08:00 |
|
648540858
|
eec4e347d7
|
优化端口保持
|
2023-03-16 20:19:00 +08:00 |
|
648540858
|
8c2b1ef4fe
|
修复拉流代理 下线时状态未更改为下线 #770
|
2023-03-14 18:46:01 +08:00 |
|
648540858
|
a7c3cf5316
|
优化跨域配置，支持同域的前后端分离部署
|
2023-03-05 09:53:26 +08:00 |
|
648540858
|
2d2832dbe9
|
优化各个配置启动顺序
|
2023-02-22 18:01:30 +08:00 |
|