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 |
|
xia-chu
|
743862d786
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-23 09:43:08 +08:00 |
|
xiongziliang
|
259247132a
|
Merge remote-tracking branch 'origin/master'
|
2021-04-22 22:13:17 +08:00 |
|
xiongziliang
|
f70bfb5f8b
|
兼容GB28181 tcp推流缓存覆盖的垃圾设备
|
2021-04-22 22:02:21 +08:00 |
|
xia-chu
|
99a1d06d9b
|
修正TWCC错误理解
|
2021-04-22 18:56:12 +08:00 |
|
xia-chu
|
90ad90cb78
|
初步完成TWCC包的解析
|
2021-04-22 17:34:26 +08:00 |
|
xia-chu
|
5db6154707
|
添加TWCC部分代码
|
2021-04-22 11:43:33 +08:00 |
|
xia-chu
|
dc3d59952e
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-20 17:58:21 +08:00 |
|
xia-chu
|
0bb87858a3
|
提升单track情况下秒开体验
|
2021-04-20 17:53:43 +08:00 |
|
xia-chu
|
9b951ab69a
|
单track情况下最多等待3秒
|
2021-04-20 17:32:40 +08:00 |
|
xia-chu
|
ef0371ef94
|
修复编译警告
|
2021-04-20 17:32:22 +08:00 |
|
xia-chu
|
007c04d958
|
编译警告修复
|
2021-04-20 17:17:56 +08:00 |
|
xia-chu
|
cce9de74d3
|
完善rtcp nack相关代码
|
2021-04-20 17:15:01 +08:00 |
|
xiongziliang
|
f69a23565d
|
Merge remote-tracking branch 'github/master' into dev
|
2021-04-18 23:13:47 +08:00 |
|
xiongziliang
|
387574a802
|
rtp主动推流时不触发无人观看事件:#799
|
2021-04-18 21:34:34 +08:00 |
|
xiongziliang
|
980867965c
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-18 21:04:10 +08:00 |
|
xiongziliang
|
7884338b60
|
修复rtmp协议amf3不兼容的bug
|
2021-04-18 21:02:01 +08:00 |
|
xia-chu
|
880b9139b0
|
性能优化
|
2021-04-15 19:46:45 +08:00 |
|
xia-chu
|
d76c38ef72
|
调整264 rtp打包逻辑
|
2021-04-15 19:40:17 +08:00 |
|
xia-chu
|
9d385b36fd
|
优化多slice情况下关键帧判断逻辑
|
2021-04-15 19:40:17 +08:00 |
|
xia-chu
|
e00fe51b26
|
关闭测试代码
|
2021-04-15 19:40:17 +08:00 |
|
xia-chu
|
46e3538dca
|
Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev
|
2021-04-15 16:22:21 +08:00 |
|
xgj
|
3150ccdb70
|
add some comment
|
2021-04-15 14:08:25 +08:00 |
|
Your Name
|
bffee09639
|
fix more slice nal one frame result rtp mark error and sps pps rtp not has a mark
|
2021-04-15 13:54:03 +08:00 |
xgj
|
6e4dfaf53f
|
fix webrtc h264 rtp Packetizer error
|
2021-04-15 00:15:41 +08:00 |
|
xia-chu
|
765db1eb8b
|
添加rtcp fci相关代码
|
2021-04-14 18:39:21 +08:00 |
|
xia-chu
|
a4ba0c2b60
|
Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-14 09:26:11 +08:00 |
|
xia-chu
|
c4fd9e294a
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-14 09:25:56 +08:00 |
|
xiongziliang
|
37096f8ed0
|
完善rtcp的定义
|
2021-04-13 22:27:57 +08:00 |
|
xia-chu
|
29c8c9bf26
|
Merge remote-tracking branch 'origin/dev' into dev
|
2021-04-13 18:51:16 +08:00 |
|
xia-chu
|
f939e0a894
|
添加一些rtcp fci相关定义
|
2021-04-13 18:50:20 +08:00 |
|
夏楚
|
136d126e74
|
Update RtpReceiver.cpp
|
2021-04-13 08:28:23 +08:00 |
|
xia-chu
|
46b84fcf39
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-12 13:48:34 +08:00 |
|
xia-chu
|
8a51bd2d9e
|
新增rtp ssrc异常处理逻辑
|
2021-04-11 20:35:00 +08:00 |
|
xiongziliang
|
753fe05813
|
采用pts
|
2021-04-11 12:07:04 +08:00 |
|
xiongziliang
|
8b7289a689
|
rtsp推流支持关闭直接代理模式
|
2021-04-11 12:06:40 +08:00 |
|
xiongziliang
|
012f58d27c
|
添加rtp 调试接口
|
2021-04-11 01:15:02 +08:00 |
|
xiongziliang
|
b2afae0e8a
|
暂时屏蔽一些日志
|
2021-04-07 21:02:28 +08:00 |
|
xia-chu
|
155c59e17e
|
添加rtc类型的推流
|
2021-04-07 18:17:49 +08:00 |
|
xia-chu
|
f374f72312
|
添加rtcp bye相关代码
|
2021-04-07 16:58:05 +08:00 |
|
xiongziliang
|
2abb5078f9
|
实现rtc转rtsp
|
2021-04-03 09:34:49 +08:00 |
ziyue
|
33d2e71368
|
合并代码，去除冗余代码
|
2021-04-02 16:23:40 +08:00 |
|
xiongziliang
|
a328520c9c
|
buf fixed
|
2021-04-01 22:24:35 +08:00 |
|
xiongziliang
|
2434470fb8
|
G711强制规格
|
2021-04-01 22:20:29 +08:00 |
|
xiongziliang
|
d2fec801c9
|
兼容不规范的rtmp推流器：#764
|
2021-04-01 22:03:21 +08:00 |
|
xiongziliang
|
075756c4c6
|
提升兼容性：#789
|
2021-04-01 21:46:02 +08:00 |
|
ziyue
|
2065b6fea8
|
去掉最大枚举定义
|
2021-03-30 11:51:19 +08:00 |
|
ziyue
|
a7a94f0885
|
sdp相关的代码移动到主目录
|
2021-03-30 10:59:15 +08:00 |
|
xiongziliang
|
81f29fea61
|
基本完成sdp的解析和生成
|
2021-03-28 18:10:43 +08:00 |
|
xiongziliang
|
8aa3ff425b
|
完善sdp相关定义
|
2021-03-27 22:23:38 +08:00 |
|
ziyue
|
2f0bdf2724
|
修复32位编译时，websocket相关bug
|
2021-03-21 18:22:32 +08:00 |
|
xiongziliang
|
f2edf354de
|
rtmp支持更新config帧
|
2021-03-21 16:50:15 +08:00 |
|
ziyue
|
c5b0485519
|
修复sps太长生成sdp异常的问题
|
2021-03-18 16:10:46 +08:00 |
|
ziyue
|
51ac93a08c
|
rtp超时检测最多暂停5分钟
更新zltoolkit
|
2021-03-16 15:37:34 +08:00 |
|
ziyue
|
060b654252
|
修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟
|
2021-03-16 11:31:41 +08:00 |
|
xiongziliang
|
a0fc494ee3
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit
|
2021-03-14 10:34:33 +08:00 |
|
xiongziliang
|
be8403c31c
|
完善代码
|
2021-03-14 10:29:17 +08:00 |
sunhui
|
f5e8bae760
|
解决不指定流或者TCP暂停断流问题
|
2021-03-10 23:17:15 +08:00 |
|
xiongziliang
|
c0f4899950
|
录制接口支持指定切片时间大小:#747
|
2021-03-07 10:41:57 +08:00 |
|
xiongziliang
|
5b4fe604cb
|
修复编译警告
|
2021-03-07 10:05:23 +08:00 |
|
xiongziliang
|
43828d4390
|
兼容某些rtmp流
|
2021-03-07 10:04:27 +08:00 |
|
xia-chu
|
9b7c9b9109
|
兼容sdp不规范的rtsp流
|
2021-02-28 21:02:23 +08:00 |
|
xiongziliang
|
fb3603b433
|
兼容一些不规范的流
|
2021-02-28 20:58:30 +08:00 |
|
xiongziliang
|
56f044f8ed
|
修复线程安全bug
|
2021-02-28 20:58:25 +08:00 |
|
xia-chu
|
8d50d3c397
|
分包逻辑添加边界检测代码
|
2021-02-21 22:24:46 +08:00 |
|
xia-chu
|
0c728827aa
|
添加全局内存统计功能
|
2021-02-21 21:28:17 +08:00 |
|
xia-chu
|
a19f67679a
|
兼容一些rtsp流 #735
|
2021-02-21 21:27:26 +08:00 |
|
xia-chu
|
19f3b1bd6f
|
防止打印过多调试信息
|
2021-02-21 21:26:45 +08:00 |
|
xia-chu
|
8d122625c5
|
修复28181相关bug：#731
|
2021-02-09 14:19:07 +08:00 |
|
xia-chu
|
b7f4eae2bc
|
修复bug
|
2021-02-09 14:01:10 +08:00 |
|
xia-chu
|
e4904623a7
|
修复rtmp兼容性bug
|
2021-02-07 23:01:22 +08:00 |
|
xia-chu
|
1f52c727ca
|
修复编译警告
|
2021-02-07 22:56:36 +08:00 |
|
xia-chu
|
a142665375
|
确保线程安全
|
2021-02-07 22:02:03 +08:00 |
|
xia-chu
|
75d97b9221
|
优化H264 rtp相关代码
|
2021-02-07 18:29:48 +08:00 |
|
xia-chu
|
80bcf53ccf
|
更新ZLToolKit并适配代码
|
2021-02-06 20:10:34 +08:00 |
|
xia-chu
|
14b318525e
|
添加rtp rtmp个数统计
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
62ba87dd0f
|
优化frame性能及整理代码
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
c5cfbce241
|
优化rtp性能
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
b0e1d5d6aa
|
重写rtp去冲突逻辑
|
2021-02-06 20:10:32 +08:00 |
|
xia-chu
|
d6fc56d950
|
时间戳异常时,确保合并帧逻辑正常：#724
|
2021-02-06 20:10:32 +08:00 |