2405 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	86afa379c4	更新zltoolkit,修复gcc下编译问题	2021-04-26 19:24:28 +08:00
xia-chu	af2b1246fd	统一帧合并逻辑	2021-04-26 18:35:01 +08:00
xia-chu	d005ccf396	更新zltoolkit	2021-04-26 18:24:34 +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	caceb90b40	修复错误拼写、加快流注册速度	2021-04-23 16:37:08 +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
xia-chu	31b6dde715	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-20 14:30:34 +08:00
xiongziliang	9004ad7a60	修复老版本openssl编译问题	2021-04-19 19:48:30 +08:00
xiongziliang	f69a23565d	Merge remote-tracking branch 'github/master' into dev	2021-04-18 23:13:47 +08:00
xiongziliang	4a6a3746dd	更新ZLToolKit	2021-04-18 23:11:08 +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	5fd23c4cf7	更新ZLToolKit	2021-04-18 21:03:20 +08:00
xiongziliang	7884338b60	修复rtmp协议amf3不兼容的bug	2021-04-18 21:02:01 +08:00
xiongziliang	77da999394	更新第三方库	2021-04-15 21:45:00 +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	cc5dee0abf	优化sdp fmtp字段处理逻辑	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	7ce965af48	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-04-14 18:39:53 +08:00
xia-chu	765db1eb8b	添加rtcp fci相关代码	2021-04-14 18:39:21 +08:00
夏楚	c8e4c916bf	Update issue templates	2021-04-14 14:55:53 +08:00
夏楚	7ad3bc854b	Update issue templates	2021-04-14 14:52:55 +08:00
夏楚	8c0781d4bf	Update issue templates	2021-04-14 14:49:50 +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