175 Commits

Author	SHA1	Message	Date
ziyue	5ee9b69568	webrtc新增自定义插件模式	2021-10-19 15:23:12 +08:00
ziyue	cfd5957c25	webrtc echo test不检查app/stream参数	2021-10-16 17:07:21 +08:00
ziyue	34365a2f8f	新增webrtc echo test双向会话示例	2021-10-16 10:52:28 +08:00
ziyue	7f3f47abbb	提取webrtc推流、播放代码为单独的派生类	2021-10-15 16:27:17 +08:00
ziyue	8b1d1d6e24	修复可能访问空指针的问题	2021-08-23 11:00:20 +08:00
xiongziliang	10afab77f3	Merge branch 'feature/keep_alive_monk' of https://gitee.com/xia-chu/ZLMediaKit	2021-08-21 19:11:20 +08:00
ziyue	0f6d1135eb	优化http调试日志性能	2021-08-12 21:29:02 +08:00
ziyue	4dbe0a1d3e	合并pr：#1025	2021-08-12 20:37:46 +08:00
baiyfcu	0ed902509a	player增加speed，pause扩展，seek支持秒级定位，MP4按时间戳生成文件	2021-08-09 18:28:43 +08:00
ziyue	77ba24b59c	修改错误代码	2021-07-02 14:55:22 +08:00
ziyue	c97678af0a	webrtc播放触发流未找到事件，实现按需生成流	2021-07-02 14:50:48 +08:00
ziyue	69c3b24d06	优化遍历MediaSource接口性能	2021-06-30 21:24:16 +08:00
ziyue	caecfc3fda	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-06-21 17:51:15 +08:00
ziyue	752590f804	完善addStreamPusherProxy相关功能并修复自动删除相关的bug	2021-06-17 11:01:14 +08:00
ziyue	aa39680c69	addStreamPusherProxy接口修改key唯一性规则,新增rtsp推流类型、超时参数	2021-06-17 10:41:26 +08:00
ziyue	eef0c31d7b	addStreamProxy新增重试次数参数	2021-06-17 10:39:22 +08:00
ziyue	936c6f7965	调整代码细节	2021-06-17 10:12:34 +08:00
monktan	cd7ae27276	添加推流代理器	2021-06-16 19:40:08 +08:00
ziyue	a67246f57e	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-06-16 10:40:17 +08:00
ziyue	92f879d703	完善PlayerProxy关闭机制,重试次数超限后自动关闭	2021-06-09 15:01:45 +08:00
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
xia-chu	46b84fcf39	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-12 13:48:34 +08:00
xiongziliang	271b180004	修复流注册事件track和regist字段缺失的bug	2021-04-11 11:39:49 +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	7e5cb33395	开始对接js	2021-03-31 17:15:26 +08:00
ziyue	272ab706b0	确保安全释放资源	2021-03-27 10:18:03 +08:00
ziyue	bdf2783a6b	还原原始文件名	2021-03-27 10:18:03 +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