3120 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ziyue	1dabc22347	修正错误注释	2022-01-10 17:00:25 +08:00
ziyue	f5efd232a9	rtsp/rtmp推流支持断连续推: #1240, #1300	2022-01-10 16:43:57 +08:00
xiongziliang	262af8dfeb	修复编译问题	2022-01-09 15:12:23 +08:00
xiongziliang	7b04385bc8	合并http-ts播放器特性: #1336	2022-01-09 15:01:23 +08:00
xiongziliang	a4c69e61cd	Merge branch 'patch2' of github.com:alexliyu7352/ZLMediaKit	2022-01-09 14:54:21 +08:00
alexliyu7352	26d458d067	增加ffmpeg拉流自动重启时间, 避免长时间拉流导致的声音不同步现象 (#1346)	2022-01-09 14:51:54 +08:00
Dw9	819599ac25	修复获取帧率逻辑 (#1293)	2022-01-09 14:50:54 +08:00
alexliyu7352	741b197f31	修复302跳转时, 如果跨域,header不正确的问题 (#1349)	2022-01-09 14:32:59 +08:00
xiongziliang	f4d8eb4515	Rtmp: 获取h264sps/aac config失败时打印rtmp包内容	2022-01-08 16:28:13 +08:00
xiongziliang	692febcadd	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-01-08 16:07:45 +08:00
xiongziliang	6e445614b4	申请udp端口使用全局互斥锁保护，防止端口重复分配	2022-01-08 16:07:08 +08:00
xgj	c22644af12	更新zlmrtcclient.js 播放客户端，增加状态改变通知	2022-01-08 15:37:20 +08:00
ziyue	afc7b019f1	完善日志去重逻辑	2022-01-07 11:00:58 +08:00
ziyue	1d81a77171	修复windows下编译错误	2022-01-06 16:05:17 +08:00
ziyue	fd6e4b6342	MPEG: 优化http-ts性能: #1342	2022-01-06 15:30:09 +08:00
ziyue	5a592e6db6	优化循环池性能	2022-01-06 14:30:44 +08:00
ziyue	e2636c5179	更新zltoolkit	2022-01-06 12:43:58 +08:00
ziyue	e43c838c2a	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-01-06 12:35:23 +08:00
ziyue	328dc77a78	Merge remote-tracking branch 'origin/master'	2022-01-06 12:34:32 +08:00
ziyue	974626024d	更新并适配zltoolkit, 过滤重复日志	2022-01-06 12:34:21 +08:00
alexliyu7352	3a0857ea31	当url并不是m3u8文件时, 避免拉取hls流出错 (#1341)	2022-01-05 20:01:19 +08:00
monktan	2fbb40135c	修改docker镜像为国内源，加快镜像构建速度	2022-01-04 21:13:55 +08:00
ziyue	ed4291bf3d	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-01-04 16:54:51 +08:00
ziyue	3ccd48e7a9	HLS: 返回全部切片数据后，链接断开不报错: #1332	2022-01-04 16:53:19 +08:00
alexliyu7352	6f9f93cb97	忘记删除很早很早以前注释掉的代码了	2022-01-04 15:46:48 +08:00
Alex	4792f6213b	新增Ts拉流	2022-01-04 15:32:59 +08:00
alexliyu7352	a441168004	修正不使用resetWhenReplay选项时, MediaSource会重复注册的问题 (#1330)	2022-01-04 14:47:41 +08:00
ziyue	80d24d2884	修复Windows下编译问题	2021-12-31 14:24:15 +08:00
ziyue	d9db31055c	更新第三方库，修复http-fmp4直播内存持续增长bug	2021-12-31 11:30:04 +08:00
ziyue	389dd5f54b	MPEG: 优化ts/ps muxer内存malloc和拷贝性能	2021-12-31 11:01:56 +08:00
ziyue	038a604d4f	openssl未找到时关闭webrtc编译	2021-12-31 10:35:52 +08:00
ziyue	c0afcc48e5	malloc大内存警告环境变量改名为MEM_WARN_SIZE	2021-12-31 10:26:36 +08:00
xiongziliang	9cf6fea03e	修复编译问题	2021-12-30 22:12:36 +08:00
ziyue	84f3aa0748	完善内存统计并在malloc大内存时打印backtrace	2021-12-30 20:34:56 +08:00
ziyue	7f6be9e118	Refine: 消除编译警告	2021-12-30 15:28:27 +08:00
ziyue	940fe333db	尝试解决全局malloc统计相关变量提前销毁的bug	2021-12-30 15:28:27 +08:00
ziyue	1a6a62a304	malloc确保内存对齐	2021-12-29 20:57:35 +08:00
夏楚	15297a3ca3	添加内存malloc次数分布统计 (#1322)	2021-12-29 20:48:15 +08:00
ziyue	098ecf542a	部分代码移至第三方库	2021-12-29 14:18:52 +08:00
ziyue	5ae5c66256	Typo: 修复拼写错误	2021-12-28 21:29:00 +08:00
ziyue	89870190e9	MPEG: 整合复用ts/ps生成代码	2021-12-28 21:21:01 +08:00
ziyue	dce6b27f4f	Http-FLV: http-flv直播采用绝对时间戳并支持las	2021-12-28 21:21:01 +08:00
ziyue	30b63ad656	Rtmp: rtmp分发改成绝对时间戳	2021-12-28 21:21:01 +08:00
ziyue	b749cfb8a3	TS: hls/http-ts 改为绝对时间戳	2021-12-28 21:21:01 +08:00
夏楚	878ce87329	支持线程内存malloc统计 (#1317)	2021-12-27 17:40:15 +08:00
xiongziliang	7f649b94e5	Rtmp: 修复openssl未开启导致链接失败的问题: #1301	2021-12-26 19:58:30 +08:00
xiongziliang	8afafb1ce0	更新第三方库: #1310	2021-12-26 19:20:21 +08:00
xiongziliang	98d435ef50	Rtmp: 修复openssl未开启导致编译失败的问题: #1301	2021-12-26 18:34:55 +08:00
ziyue	3d44c772ac	HLS: hls播放器解析ts失败时，清空数据以便恢复播放	2021-12-24 19:58:27 +08:00
ziyue	b1f68b9563	Splitter公开一些方法	2021-12-24 19:57:03 +08:00