Commit Graph

517 Commits

Author SHA1 Message Date
648540858
17e9631de4 修复多节点时端口丢失的问题 2024-05-09 23:53:36 +08:00
648540858
632075da9b 优化接收BYE消息后的处理 2024-05-09 23:41:27 +08:00
648540858
edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
WuPeng
424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +08:00
648540858
39c3274294 合并分支 2024-04-25 17:53:24 +08:00
648540858
d41d6b34af Merge branch 'refs/heads/2.7.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.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/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
2024-04-23 20:59:20 +08:00
648540858
0d0b31f715 临时提交 2024-04-19 10:27:24 +08:00
648540858
73559cc6b3 临时提交 2024-04-18 18:19:27 +08:00
648540858
55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858
407a5edebf 优化多wvp国标级联推流时推流信息的清理 2024-04-17 23:31:48 +08:00
648540858
bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00
648540858
9c6765d44e 重构多wvp国标级联机制 2024-04-16 22:10:35 +08:00
648540858
b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858
f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858
f34143df6d 修改totalReaderCount类型 2024-04-12 10:36:18 +08:00
648540858
da54cdf3b8 解决空指针异常 2024-04-12 09:00:39 +08:00
648540858
5c0183a422 修复无法下载较长时间时间录像的BUG 2024-04-11 22:25:57 +08:00
648540858
8750f0f3dd 去除多余代码 2024-04-11 16:58:56 +08:00
648540858
ab20f76885 去除多余代码 2024-04-11 16:58:03 +08:00
648540858
e222095636 修复流数据写入缓存 2024-04-11 16:55:34 +08:00
648540858
651d4a1b0e 优化代码调用 2024-04-11 14:28:42 +08:00
648540858
f458c9b793 优化代码调用 2024-04-10 22:38:12 +08:00
648540858
6c0087db88 优化代码调用 2024-04-10 20:56:45 +08:00
leesam
10e2180c72 [bugfix]支持context-path配置 2024-04-10 19:07:37 +08:00
648540858
82ca3a778a 优化媒体节点redis数据格式 2024-04-09 22:52:06 +08:00
648540858
54b878d2e1 优化代码,升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
648540858
a1861038e5 修复录像下载 2024-04-09 19:53:43 +08:00
648540858
de5d025cee 修复单端口收流时音频禁用失败的问题 2024-04-09 16:10:02 +08:00
648540858
ab318fcf70 修复点播错误时关闭rtpserver 2024-04-09 14:53:11 +08:00
648540858
bbf19c7909 合并主线 2024-04-09 10:40:16 +08:00
648540858
0b2f635176 移除非主线内容 2024-04-09 10:30:00 +08:00
648540858
aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858
7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858
a1c02605c1 abl-实现closeRtpServer 2024-04-02 14:41:02 +08:00
648540858
8b90fade9e 支持使用abl接收国标流 2024-04-02 00:05:09 +08:00
648540858
b78769f997 临时提交 2024-04-01 18:35:26 +08:00
648540858
33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858
722f1d0ee7 国标级联-修复拉流代理播放 2024-04-01 16:17:01 +08:00
648540858
426ea72d7f 修复拉流代理播放 2024-04-01 15:46:36 +08:00
648540858
73733ab13f 修复推流播放 2024-04-01 15:40:21 +08:00
648540858
fd2ef6effe 修复国标点播 2024-04-01 15:29:49 +08:00
648540858
ecd1d2a414 临时提交 2024-04-01 15:22:45 +08:00
648540858
5973dcd975 修复点播与录像回放 2024-03-31 00:34:44 +08:00
648540858
4548695a0b hook优化 2024-03-31 00:28:45 +08:00
648540858
0447b83c3a 临时提交 2024-03-29 23:41:00 +08:00
648540858
7a3b9c6f69 调整hook订阅通知的位置 2024-03-28 19:10:53 +08:00
648540858
cc793d16f5 调整hook订阅通知的位置 2024-03-28 18:35:28 +08:00
648540858
6de0c329ea 移除多余的节点启动事件分发 2024-03-26 23:38:49 +08:00
648540858
0c2180c07f 支持处理流没找到事件 2024-03-26 23:36:55 +08:00
648540858
f218d7bbd6 支持发送流没找到事件 2024-03-26 23:16:08 +08:00