3833 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	8da9aee11a	兼容无metadata的rtmp流	2019-09-21 19:27:34 +08:00
xiongziliang	9d43c38e09	add exit event	2019-09-20 17:58:50 +08:00
xiongziliang	91adaaaab6	回滚代码	2019-09-20 14:05:23 +08:00
xiongziliang	eb2c514e72	删除二进制文件，改成github的Release发布	2019-09-20 11:50:17 +08:00
xiongziliang	9735d891da	整理代码	2019-09-20 10:37:41 +08:00
xiongziliang	5ad4103ce0	修正拼写错误	2019-09-20 10:36:37 +08:00
夏楚	81c757a0dc	Update README.md	2019-09-19 10:00:10 +08:00
xiongziliang	2d96124f45	去除冗余依赖	2019-09-18 17:12:53 +08:00
xiongziliang	3268daa42b	精简代码	2019-09-18 10:27:40 +08:00
baiyfcu	f31773ee19	Merge pull request #7 from zlmediakit/master ... update	2019-09-17 12:09:24 +08:00
xiongziliang	10e74b7eb6	修复websocket跨域问题	2019-09-17 10:29:15 +08:00
xiongziliang	ca0fc13367	添加提示	2019-09-17 10:11:09 +08:00
xiongziliang	d4506f946d	完成测试程序的说明	2019-09-17 09:56:11 +08:00
xiongziliang	ee8d28dbef	单独提供websocket服务器程序	2019-09-17 09:48:20 +08:00
xiongziliang	4d84ae92f9	Support websocket client	2019-09-16 18:32:25 +08:00
xiongziliang	e7550d796a	替换websocket测试服务器	2019-09-16 18:11:41 +08:00
xiongziliang	00e64ed279	添加注释完善代码	2019-09-16 18:02:33 +08:00
xiongziliang	78069ce0e5	添加bom	2019-09-16 17:46:39 +08:00
xiongziliang	644905a374	实现websocket客户端模板	2019-09-16 17:45:27 +08:00
xiongziliang	3095075749	完善websocket服务器	2019-09-16 17:42:52 +08:00
baiyfcu	671f22077a	添加websocket client支持	2019-09-12 13:44:38 +08:00
baiyfcu	f28b732ae8	Merge pull request #6 from zlmediakit/master ... update	2019-09-12 11:23:24 +08:00
xiongziliang	96aa687fea	完善http文件访问鉴权逻辑	2019-09-11 16:37:49 +08:00
xiongziliang	8fe876c0ef	修复http文件鉴权漏洞	2019-09-11 15:51:42 +08:00
xiongziliang	d30d0e2b29	issue:#83	2019-09-11 09:21:10 +08:00
xiongziliang	7701a883e3	提高EasyDarwin的rtsp推流兼容性	2019-09-10 17:08:24 +08:00
xiongziliang	ae64bc9bcb	不指定协议转换时，默认转换hls，rtxp ... 提高EasyDarwin的rtsp推流兼容性	2019-09-10 17:01:42 +08:00
xiongziliang	d41d116a67	兼容带url参数的rtsp推流	2019-09-10 16:00:39 +08:00
xiongziliang	e67894a085	推流鉴权事件支持是否允许转rtsp/rtmp、hls 、mp4	2019-09-10 11:06:31 +08:00
夏楚	15539bc27e	Merge pull request #80 from zqsong/master ... 修复推送H265的时候,每一帧都split导致耗时过长	2019-09-09 10:55:12 +08:00
zqsong	005db3cbc5	修复推送H265的时候,每一帧都split导致耗时过长	2019-09-09 10:44:34 +08:00
xiongziliang	2192451cd1	修复http文件鉴权相关bug	2019-09-09 09:41:23 +08:00
xiongziliang	47cb4b8edc	完善rtp打包	2019-09-06 23:23:43 +08:00
xiongziliang	203edc5cec	完善rtp打包	2019-09-06 23:22:04 +08:00
xiongziliang	9f1a91cda6	rtmp支持带后缀名的url	2019-09-06 18:30:42 +08:00
xiongziliang	dd188f08fd	完善配置注释	2019-09-06 18:03:40 +08:00
xiongziliang	39e3c89848	rtp打包减少一次内存拷贝	2019-09-06 15:16:22 +08:00
xiongziliang	ca8e295ada	Merge remote-tracking branch 'origin/master'	2019-09-05 15:00:53 +08:00
xiongziliang	d8de1e226c	完善对H265的sdp兼容性	2019-09-05 14:56:33 +08:00
夏楚	ab38c24fc7	Update README_CN.md	2019-09-05 14:25:46 +08:00
xiongziliang	f1dce22915	兼容多线程编码的帧	2019-09-05 11:15:30 +08:00
xiongziliang	d6fa0296cb	添加配置项ultraLowDelay,可选择是否低延时模式	2019-09-04 18:57:54 +08:00
xiongziliang	d864e7084b	修复rtmp点播移动时间轴相关bug	2019-09-03 17:20:56 +08:00
xiongziliang	226473a223	更新ZLToolKit(修复点播结束后，MediaReader对象还无法销毁的的bug)	2019-09-03 16:40:10 +08:00
baiyfcu	a3c8cb11b3	Merge pull request #5 from zlmediakit/master ... update	2019-09-02 20:31:04 +08:00
xiongziliang	3c4d7498bc	完善兼容性	2019-08-30 16:56:57 +08:00
夏楚	cfc7dc2126	Merge pull request #74 from 3503207480/master ... PR： 注释，说明， 除以0错误	2019-08-30 11:49:11 +08:00
3503207480@qq.com	a7953fdbca	除以0错误 ... 有的rtsp设备无此参数，不能除以0	2019-08-30 11:18:25 +08:00
3503207480@qq.com	036b36f012	注释，说明 ... 注释，说明	2019-08-30 11:17:27 +08:00
xiongziliang	64cf7efa13	删除无效代码	2019-08-30 10:34:00 +08:00