262 Commits

Author	SHA1	Message	Date
ziyue	89d0a9dedf	屏蔽动态添加配置文件的特性	2021-06-08 14:49:32 +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	92736db5b2	适配zltoolkit	2021-06-08 11:29:32 +08:00
xgj	d74779dc02	set server config can dynamic add config for add multi ffmpeg cmd template	2021-06-04 18:06:40 +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	b7e6bfb574	hook接口在http头中附带vhost:#872	2021-05-22 09:53:31 +08:00
xiongziliang	7641db4225	getMediaList等接口返回录制状态:#876	2021-05-22 09:31:59 +08:00
xia-chu	6292824e34	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-30 18:05:48 +08:00
xia-chu	af59fdeb86	addStreamProxy接口支持超时参数	2021-04-30 18:01:48 +08:00
xiongziliang	9e93561c77	只有linux平台打开链接顺序无关选项	2021-04-11 11:53:05 +08:00
xiongziliang	5fadd2665d	非windows平台，才忽略静态库链接顺序	2021-04-11 11:44:16 +08:00
xiongziliang	bbe67e928e	Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev	2021-04-11 11:42:45 +08:00
xiongziliang	e094a0bcae	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-04-11 11:41:27 +08:00
xiongziliang	271b180004	修复流注册事件track和regist字段缺失的bug	2021-04-11 11:39:49 +08:00
xgj	ebf650cf4f	fix static library link order	2021-04-10 22:24:26 +08:00
xiongziliang	b180ea0609	删除测试代码	2021-04-09 20:42:05 +08:00
xia-chu	38894097ae	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-09 10:47:14 +08:00
xia-chu	67e1b1f194	媒体注册hook添加编码等信息	2021-04-08 17:34:46 +08:00
xia-chu	a22a6bafb7	添加流量统计事件	2021-04-07 18:35:38 +08:00
xia-chu	0c5fa36e4d	rtc推流添加媒体事件相关接口	2021-04-07 18:18:27 +08:00
xia-chu	b96052d387	完善rtc异常管理	2021-04-07 17:51:47 +08:00
xiongziliang	50ca789c0c	预留同时推流拉流的接口	2021-04-05 11:32:38 +08:00
xiongziliang	fe02f2cf1c	rtc推流和播放添加事件触发	2021-04-04 23:20:10 +08:00
ziyue	33d2e71368	合并代码，去除冗余代码	2021-04-02 16:23:40 +08:00
xiongziliang	9a26ba9f8a	修复android下编译问题	2021-04-01 20:14:07 +08:00
ziyue	7e5cb33395	开始对接js	2021-03-31 17:15:26 +08:00
ziyue	45b8f83131	删除测试代码	2021-03-30 13:53:45 +08:00
ziyue	9d2498a694	candidate foundation改为string类型	2021-03-29 12:28:47 +08:00
ziyue	272ab706b0	确保安全释放资源	2021-03-27 10:18:03 +08:00
ziyue	bdf2783a6b	还原原始文件名	2021-03-27 10:18:03 +08:00
ziyue	704421b728	完善	2021-03-26 18:22:19 +08:00
ziyue	65e470e060	初步添加rtsp转webrtc相关功能	2021-03-25 16:01:54 +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	ce80edffd2	增加支持TCP暂停	2021-03-11 10:05:53 +08:00
xiongziliang	c0f4899950	录制接口支持指定切片时间大小:#747	2021-03-07 10:41:57 +08:00
xia-chu	0c728827aa	添加全局内存统计功能	2021-02-21 21:28:17 +08:00
xia-chu	14b318525e	添加rtp rtmp个数统计	2021-02-06 20:10:33 +08:00
xiongziliang	bad9553ec4	统计TcpServer个数	2021-01-24 21:59:55 +08:00
xiongziliang	aa45590c13	添加对象统计接口	2021-01-23 09:44:37 +08:00
xiongziliang	af2481c619	ffmpeg拉流支持指定命令模板	2021-01-23 09:42:15 +08:00
xia-chu	f63b2b1863	去除编译警告，修复bug	2021-01-19 16:05:38 +08:00
xiongziliang	5d752c89b5	修复编译问题	2021-01-17 20:15:08 +08:00
xia-chu	b6cbc87712	全面整理代码，去除编译警告	2021-01-17 18:31:50 +08:00
xiongziliang	b2fe8c926c	完善代码	2021-01-17 10:29:29 +08:00
monktan	3ddc14d35d	合并pr(#661): 减少unsport code打印，新增git信息获取 ... (cherry picked from commit 47f2f5b349)	2021-01-02 22:02:23 +08:00
xiongziliang	13221ad796	http回复根据状态码自动生成status message: #602	2021-01-02 21:24:06 +08:00
xiongziliang	c69e9b8ec1	主动发送rtp接口(startSendRtp)支持返回本地端口: #538	2021-01-02 20:43:02 +08:00