Commit Graph

882 Commits

Author SHA1 Message Date
648540858
e078360928 修复语音对讲 2024-09-11 16:59:52 +08:00
648540858
3140672e63 修复国标录像下载 2024-09-10 16:50:54 +08:00
648540858
7cc4c9d14a 临时提交 2024-09-09 17:56:46 +08:00
648540858
2e90344c89 临时提交 2024-09-09 11:16:02 +08:00
648540858
489fbe31a5 临时提交 2024-09-09 00:07:00 +08:00
648540858
3fafe83e88 临时提交 2024-09-07 22:37:32 +08:00
648540858
cc302be2f2 临时提交 2024-09-07 22:27:32 +08:00
648540858
b7e96de36a 临时提交 2024-09-07 00:04:36 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
ad5b66eb71 临时提交 2024-09-04 18:01:54 +08:00
648540858
4597fb197d 临时提交 2024-09-04 10:30:26 +08:00
648540858
fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00
648540858
ddf917d127 临时提交 2024-08-28 17:10:53 +08:00
648540858
64e9b6674f 修复通道共享的BUG以及增加通道手动推送的功能 2024-08-28 16:04:48 +08:00
648540858
dd794d4868 临时提交 2024-08-27 17:56:49 +08:00
648540858
5a259aaa63 临时提交 2024-08-24 00:18:54 +08:00
648540858
d2654660cb 临时提交 2024-08-23 17:50:29 +08:00
648540858
9247c7e805 完善国标级联点播推流,拉流代理,国标 2024-08-17 22:31:13 +08:00
648540858
aeb3cd6a22 临时提交 2024-08-16 17:59:53 +08:00
648540858
abed3ecbec 临时提交 2024-08-15 17:45:24 +08:00
648540858
cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
648540858
d5621f9489 临时提交 2024-08-13 18:03:34 +08:00
648540858
ad240ba9a4 优化国标级联点播逻辑 2024-08-13 17:57:25 +08:00
648540858
213b218efa 临时提交 2024-08-12 18:00:06 +08:00
648540858
9a4a81a90e 临时提交 2024-08-12 15:30:01 +08:00
panlinlin
0177831e86 临时提交 2024-08-11 23:20:42 +08:00
panlinlin
76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858
16708e385b 支持多WVP的推流播放 2024-08-09 16:27:08 +08:00
648540858
7f8a15f017 优化收到目录时的分组信息处理 2024-08-09 11:08:40 +08:00
panlinlin
a1671c3c3e 临时提交 2024-08-08 23:44:03 +08:00
648540858
8ab88c0f02 临时提交 2024-08-08 22:43:37 +08:00
panlinlin
3e220a2c1e 临时提交 2024-08-07 23:45:29 +08:00
648540858
d97accee4a 临时提交 2024-08-06 16:55:33 +08:00
648540858
6bd0cdd37b 临时提交 2024-07-23 18:00:47 +08:00
648540858
9f4e66a38b 优化拉流代理 2024-07-19 17:54:14 +08:00
panlinlin
0853d7e842 临时提交 2024-07-11 23:52:34 +08:00
648540858
b843958ed7 临时提交 2024-07-10 14:43:22 +08:00
648540858
bb609b7e09 临时提交 2024-07-10 10:51:35 +08:00
648540858
046e7802f3 临时提交 2024-07-09 17:55:51 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
adf040ec4b 优化日志以及属性设置代码 2024-07-03 17:09:49 +08:00
648540858
799932f614 优化日志以及属性设置代码 2024-07-03 16:14:18 +08:00
648540858
324fef2908 临时提交 2024-07-01 17:59:14 +08:00
648540858
88c021948f 临时提交 2024-06-27 18:41:58 +08:00
648540858
400eef2d2e 临时提交 2024-06-27 16:02:43 +08:00
648540858
e4c11bfebe Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
2024-06-25 16:46:47 +08:00
648540858
68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
648540858
87c071fd5e 合并271分支 2024-06-25 10:24:35 +08:00
648540858
57a230afb3 Merge branch 'refs/heads/2.7.1'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
2024-06-25 09:45:34 +08:00
648540858
306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00