ziyue
|
40c1cb239d
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-06-08 17:52:44 +08:00 |
|
ziyue
|
6ccf512367
|
完善内存统计
|
2021-06-08 17:49:12 +08:00 |
|
ziyue
|
0593f65fcb
|
完善代码
|
2021-06-08 14:50:12 +08:00 |
|
ziyue
|
e88281b2ff
|
删除无效代码
|
2021-06-08 14:49:48 +08:00 |
|
ziyue
|
9de39de88c
|
Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev
|
2021-06-08 14:41:52 +08:00 |
|
ziyue
|
edf9129f7e
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-06-08 14:40:51 +08:00 |
|
ziyue
|
c4817c6d5f
|
GB28181单端口接收流支持多线程
|
2021-06-08 14:03:25 +08:00 |
|
ziyue
|
92736db5b2
|
适配zltoolkit
|
2021-06-08 11:29:32 +08:00 |
xgj
|
8721c5a62b
|
for joy4 rtmp push onMetaData compatibility
|
2021-06-08 10:07:51 +08:00 |
|
xgj
|
0f3a8f4a9d
|
fix webrtc to rtmp multi slice on frame error
|
2021-06-07 17:32:28 +08:00 |
|
ziyue
|
8f62365847
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-05-26 10:43:52 +08:00 |
夏楚
|
3b4e7619ad
|
Merge pull request #865 from yapingcat/master
fix bug rtcp sr包的 ssrc 和rtp包中ssrc的不一致
|
2021-05-22 11:04:50 +08:00 |
|
xiongziliang
|
9f223bc7a2
|
Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev
|
2021-05-22 10:25:05 +08:00 |
|
xiongziliang
|
975c11b74c
|
支持http响应无content-length字段的情况:#850
|
2021-05-22 10:22:56 +08:00 |
|
xiongziliang
|
7067472a18
|
转协议支持全局关闭音频:#883
|
2021-05-22 10:17:52 +08:00 |
|
xiongziliang
|
f54e02f511
|
修复http文件服务器相关bug
|
2021-05-22 09:28:19 +08:00 |
|
xiongziliang
|
8cbec43ee8
|
合并代码
|
2021-05-22 09:26:49 +08:00 |
|
xiongziliang
|
a391d1e289
|
修复rtsp推流带参相关的bug:#840
|
2021-05-22 09:25:24 +08:00 |
|
xiongziliang
|
08d4edddb0
|
修复http文件服务器相关bug
|
2021-05-22 09:13:00 +08:00 |
yapingcat
|
3c49b3737e
|
fix bug rtcp sr包的 ssrc 和rtp包中的一致
|
2021-05-17 09:20:03 +08:00 |
|
xiongziliang
|
d395d23eeb
|
由于在RtspSession类确保了函数执行顺序，所以回滚多余代码也能确保单track流迅速注册
|
2021-05-15 10:05:47 +08:00 |
|
xiongziliang
|
4cd618899b
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-05-15 10:02:58 +08:00 |
|
xiongziliang
|
125b703ea9
|
Merge remote-tracking branch 'origin/master'
|
2021-05-15 09:57:21 +08:00 |
|
xiongziliang
|
e807a08f2e
|
单track rtsp推流加快媒体注册速度
|
2021-05-15 09:56:35 +08:00 |
|
xia-chu
|
5c90a1e137
|
完善nack与丢包重传
|
2021-05-11 11:18:55 +08:00 |
|
xiongziliang
|
e8d3dec050
|
getBitArray方法返回nack第一个包状态
|
2021-05-11 00:34:17 +08:00 |
|
xiongziliang
|
ec8e518180
|
完善fci相关代码
|
2021-05-10 23:27:11 +08:00 |
|
xia-chu
|
45abc23e87
|
放宽fci长度校验
|
2021-05-10 10:14:00 +08:00 |
|
xiongziliang
|
0377796c03
|
修复clang下编译警告和错误
|
2021-05-08 19:33:51 +08:00 |
|
xia-chu
|
842257edaa
|
完善rtcp ext
|
2021-05-06 12:02:16 +08:00 |
|
xia-chu
|
cbee3210a0
|
完善twcc fci
|
2021-05-06 12:01:56 +08:00 |
|
xia-chu
|
6274cbdd28
|
统一代码风格
|
2021-04-30 14:31:08 +08:00 |
|
夏楚
|
1d0eca512b
|
!6 优化rtsp推流单个Track其他协议的注册速度，不需要等待3s
Merge pull request !6 from xiongguangjie/dev
|
2021-04-30 14:29:36 +08:00 |
|
xia-chu
|
3cc640f96e
|
删除无效配置
|
2021-04-30 11:44:06 +08:00 |
|
xia-chu
|
88e1c323c3
|
删除无效配置
|
2021-04-30 09:24:09 +08:00 |
xgj
|
5145c7e658
|
optimize one track ready speed not wait 3000ms
|
2021-04-29 18:36:04 +08:00 |
|
xia-chu
|
e021279fab
|
修复"Too short data for FU-A H.264 RTP packet"的问题
|
2021-04-28 16:07:01 +08:00 |
|
xia-chu
|
514a028eac
|
修复fu-a打包时，无rtp负载的情况
|
2021-04-28 16:03:05 +08:00 |
|
xia-chu
|
ac55ae79fb
|
修复fci内存越界问题
|
2021-04-28 13:55:00 +08:00 |
|
xia-chu
|
1d84bb5458
|
完善twcc相关逻辑
|
2021-04-26 21:50:31 +08:00 |
|
xia-chu
|
6c951c8ca9
|
完善rtcp padding相关逻辑
|
2021-04-26 21:50:10 +08:00 |
|
xia-chu
|
2d8ef45e4d
|
完善fci相关代码
|
2021-04-26 21:03:04 +08:00 |
|
xia-chu
|
aa54adb1ab
|
修复编译问题
|
2021-04-26 20:29:06 +08:00 |
|
xia-chu
|
cf520491fa
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-26 19:50:17 +08:00 |
|
xia-chu
|
af2b1246fd
|
统一帧合并逻辑
|
2021-04-26 18:35:01 +08:00 |
|
xia-chu
|
a28c76a33c
|
限制未就绪状态track的最大帧缓存数量
|
2021-04-26 14:58:06 +08:00 |
|
xia-chu
|
fbc8c2286e
|
等待添加fci相关适配代码
|
2021-04-23 18:30:37 +08:00 |
|
xia-chu
|
8702ad101b
|
完善rtcp feedback相关代码
|
2021-04-23 18:27:47 +08:00 |
|
xia-chu
|
93160c0ec7
|
添加rtpfb枚举与工具类
|
2021-04-23 15:25:33 +08:00 |
|
xia-chu
|
48338af700
|
完善FCI相关代码
|
2021-04-23 15:06:55 +08:00 |