3971 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongguangjie	89b135400c	Merge remote-tracking branch 'origin/master' into feature/srt	2022-06-04 15:47:47 +08:00
xiongguangjie	086146a344	try fix windows build error	2022-06-04 14:05:51 +08:00
xiongguangjie	9a57353470	add srt on readme	2022-06-04 13:31:36 +08:00
xiongguangjie	4d9a55b924	add srt usage for zlm	2022-06-04 13:31:15 +08:00
xiongguangjie	92420f8392	check stream id	2022-06-04 13:30:59 +08:00
xiongguangjie	cd6b0ee0c4	fix peer ip error	2022-06-04 12:22:55 +08:00
xiongguangjie	af9bd2dd0a	fix streamid zero error	2022-06-04 12:03:56 +08:00
xiongguangjie	91aa9c494c	srt can play stream	2022-06-04 11:23:18 +08:00
xiongziliang	df9a9649b0	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-06-04 11:08:13 +08:00
xiongziliang	b23cbaa0f8	on_publish hook新增continue_push_ms参数，用于断连续推延时控制	2022-06-04 11:06:35 +08:00
xiongguangjie	6237dd48dc	add commet and remove compile warn	2022-06-04 10:11:28 +08:00
xiongguangjie	7f65e082f5	can build prepare for play ts stream by srt	2022-06-03 22:47:52 +08:00
xiongguangjie	82da99eef3	add shutdown packet and flow report	2022-06-03 21:17:01 +08:00
xiongguangjie	b9f66ca1ec	add srt push string	2022-06-03 20:38:35 +08:00
xiongguangjie	18f4870cfe	emit push is srt	2022-06-03 20:26:53 +08:00
xiongguangjie	7606dd7110	for srt push fix ack paramter error result in pkt lost	2022-06-03 20:18:34 +08:00
xiongguangjie	7038924c6f	for srt set recv buf	2022-06-03 18:05:24 +08:00
xiongguangjie	ddc5b59a65	some change	2022-06-03 17:49:43 +08:00
xiongguangjie	9fadc22c80	srt can push but bandwith estimate has error	2022-06-03 16:47:53 +08:00
xiongguangjie	1891c4e391	add srt push type	2022-06-03 15:02:07 +08:00
xiongguangjie	aa2ff01d9f	first commit for srt intergrate	2022-06-03 13:25:32 +08:00
taojishou	59dcd03b70	修改hls拉流后closestream崩溃的bug (#1678) ... * 修改hls拉流后closestream崩溃的bug Co-authored-by: 夏楚 <771730766@qq.com>	2022-06-01 13:05:49 +08:00
xiongziliang	b0beea7781	修复笔误	2022-05-30 12:44:11 +08:00
xiongziliang	cea30f8180	修复低版本gcc编译问题:#1667	2022-05-29 22:13:07 +08:00
xiongziliang	fd52ba31b0	忽略SIGHUP信号	2022-05-29 21:44:53 +08:00
xiongziliang	ea6ef2779e	新增url判空逻辑	2022-05-29 21:36:34 +08:00
xiongziliang	4f05aef245	兼容一些老的c编译器: #1668	2022-05-29 21:30:06 +08:00
xiongziliang	57d65e47cf	暂时关闭EPOLLEXCLUSIVE特性	2022-05-28 10:51:09 +08:00
xiongziliang	0639595d1f	更新zltoolkit, 完善对无ipv6网络环境的支持	2022-05-28 10:42:57 +08:00
xiongziliang	fd4145a622	完善对rtp负载为空处理逻辑：#1661	2022-05-28 10:34:54 +08:00
xiongziliang	6596eec069	Merge branch 'rtc_audio_delay' of github.com:mtdxc/ZLMediaKit	2022-05-28 10:21:48 +08:00
xiongziliang	ff2e4cf152	添加ffmpeg相关cmake文件	2022-05-28 10:19:12 +08:00
xiongziliang	a11289e5f0	集群模式，溯源重试改成最大3次: #1663	2022-05-28 09:52:31 +08:00
xiongziliang	0c5b3f87e5	优化cmake	2022-05-28 09:48:19 +08:00
xiongziliang	93201f40d3	优化日志提示	2022-05-28 09:47:48 +08:00
baiyfcu	4e57416be9	修复cmake generate export 和 test工程先后变编译错误问题	2022-05-27 17:03:49 +08:00
cqm	3110284302	修复rtc单独播放音频延时高问题	2022-05-27 09:39:03 +08:00
夏楚	e2908e9775	cmake构建时自动生成mk_export头文件,解决msvc链接设备问题 (#1660) ... * 解决msvc下链接问题 * CMAKE添加自动生成mk api export头文件 * 兼容非cmake构建时情况 Co-authored-by: baiyfcu <baiyfcu@gmail.com>	2022-05-26 20:30:43 +08:00
ziyue	989e7b2e75	解决msvc下编译问题	2022-05-26 11:59:19 +08:00
ziyue	59ff0a9a1a	添加utf-8 bom头，解决msvc下编译问题	2022-05-26 11:00:48 +08:00
ziyue	d79178d116	解决msvc下编译问题	2022-05-26 10:49:44 +08:00
ziyue	5f3a46d611	FFmpeg未找到时，忽略player_opencv用例	2022-05-25 16:06:30 +08:00
ziyue	cb0e5c6c57	全面更新整理c sdk	2022-05-25 15:51:24 +08:00
ziyue	9736badcea	优化编解码相关代码	2022-05-25 15:51:17 +08:00
ziyue	0739b1ddd2	完成FFmpeg相关代码迁移改造	2022-05-25 15:51:08 +08:00
ziyue	fa70af7cce	移动FFmpeg相关代码	2022-05-25 15:51:02 +08:00
xiongziliang	6f8ff98afd	更新zltoolkit，并更新作者列表	2022-05-21 19:55:21 +08:00
zhaoyi233	d78657b706	检查sendmmsg相关依赖并设置对应的宏	2022-05-21 15:18:51 +08:00
xiongziliang	b0f0bdb6ae	调整优化webrtc sdp处理相关代码	2022-05-20 22:14:21 +08:00
xiongziliang	757001ad8a	Merge branch 'sdp_munging' of github.com:mtdxc/ZLMediaKit	2022-05-20 21:58:58 +08:00