214 Commits

Author	SHA1	Message	Date
xiongziliang	1f43359b31	Merge branch 'master' of https://github.com/baiyfcu/ZLMediaKit	2020-04-18 16:05:49 +08:00
baiyfcu	40afa204d5	增加rtmp/rtsp对音频G711A,G711U的支持	2020-04-17 17:47:10 +08:00
xiongziliang	1a97c2e3cd	优化特定情况下丢帧问题	2020-04-17 15:19:42 +08:00
xiongziliang	99a55ddaaa	添加合并写功能	2020-04-09 16:19:03 +08:00
baiyfcu	340629cdc6	添加对g711A/U rtsp支持相关文件，api添加windows静态库编译选项，g711 RTMP支持尚未修改	2020-04-08 15:42:52 +08:00
xiongziliang	0fc1499643	添加性能测试模式	2020-04-08 11:16:09 +08:00
xiongziliang	1352e159f1	优化性能	2020-04-07 10:26:07 +08:00
xiongziliang	45c5f1ec4c	避免死锁	2020-04-06 21:23:35 +08:00
xiongziliang	e192931429	修复动态添加HlsMediaSource后无法获取Track列表的问题	2020-04-05 10:32:42 +08:00
xiongziliang	d3db5e0ce0	完善录制相关功能	2020-04-05 09:48:38 +08:00
xiongziliang	e5d5cabf89	部分恢复录制相关接口	2020-04-05 09:26:29 +08:00
xiongziliang	f226aed145	全面支持265(包括rtmp)	2020-04-04 23:20:42 +08:00
xiongziliang	7019e4717c	整理授权协议	2020-04-04 20:30:09 +08:00
xiongziliang	11420b868b	整理代码	2020-04-04 19:55:11 +08:00
xiongziliang	708300951b	优化rtmp点播	2020-04-04 15:37:37 +08:00
xiongziliang	cefb2a7cc4	hls/mp4录制不再能随时开启或关闭	2020-04-04 14:33:12 +08:00
xiongziliang	a581f78d12	优化点播相关代码	2020-04-04 08:30:20 +08:00
xiongziliang	6e5cd0345d	优化点播相关代码	2020-04-03 23:27:16 +08:00
xiongziliang	42eece5b9a	mp4点播无人观看时自动关闭	2020-04-03 22:39:44 +08:00
xiongziliang	46be8a38e7	重写MP4点播	2020-04-03 20:45:58 +08:00
xiongziliang	ace200716a	修复无人播放事件触发延时不准确的bug	2020-03-23 10:21:17 +08:00
xiongziliang	1168174c2b	tab统一替换为4个空格键：#242	2020-03-20 11:51:24 +08:00
xiongziliang	e4e5400641	优化虚拟主机相关	2020-03-12 12:47:15 +08:00
xiongziliang	f76a203768	完善注释	2020-03-10 23:22:48 +08:00
xiongziliang	10884340b0	优化rtp推流相关代码	2020-03-08 21:19:20 +08:00
xiongziliang	c77f82f02c	尝试添加rtp类型自动判断逻辑	2020-03-04 22:25:00 +08:00
xiongziliang	f384f5e025	解决死锁问题	2020-03-04 21:57:31 +08:00
xiongziliang	e6eee321ea	优化临界状态丢起始帧的问题	2020-02-27 12:31:57 +08:00
xiongziliang	d60101b93c	优化单Track情况下等待3秒的情况	2020-02-25 14:59:40 +08:00
xiongziliang	a7a376b3f2	流量汇报事件添加id参数	2020-02-13 12:10:08 +08:00
xiongziliang	7e25537957	流量汇报事件添加客户端ip和端口参数	2020-02-13 11:33:59 +08:00
xiongziliang	6a97fcb3de	媒体注册、重置事件改成同步触发	2020-02-01 22:57:48 +08:00
xiongziliang	4470f2e427	添加addTrackCompleted方法，缩短流注册延时	2020-01-22 19:09:53 +08:00
xiongziliang	4a7d17334c	rtsp不允许覆盖时间戳(pts)	2020-01-14 10:29:27 +08:00
xiongziliang	d8dbf43490	优化dts生成性能	2020-01-14 10:25:14 +08:00
xiongziliang	ec67900665	优化不含B帧时的dts生成性能	2020-01-14 10:06:35 +08:00
xiongziliang	9fa6e9d8d9	添加dts生成算法，兼容含B帧的rtsp推流	2020-01-14 10:04:24 +08:00
xiongziliang	b55db11de3	解决rtmp过早注册的问题	2020-01-13 15:48:55 +08:00
xiongziliang	66ec67bfb9	1、修复生成的rtmp无法被flash播放的问题 ... 2、修复RTSP有B帧时，相对时间戳计算异常的问题	2020-01-13 11:51:29 +08:00
xiongziliang	5d2864cff2	优化DevChannel内存拷贝问题	2020-01-08 12:15:59 +08:00
xiongziliang	57c5d2963a	优化DevChannel内存拷贝问题	2020-01-08 12:14:27 +08:00
Gemfield	e31c1ee207	Add optional customized_path parameter for startRecord	2020-01-02 12:47:12 +08:00
xiongziliang	e91c26c052	实现hls的流量汇报事件	2019-12-29 15:38:29 +08:00
xiongziliang	97ad062dcf	默认关闭rtmp时间戳覆盖	2019-12-29 12:16:02 +08:00
xiongziliang	4b4c4e0cec	实现hls按需拉流	2019-12-29 11:52:02 +08:00
xiongziliang	54736859d4	基本完成hls相关的主要事件	2019-12-29 10:49:04 +08:00
xiongziliang	1afacdcff8	初步添加HlsMediaSource	2019-12-28 18:50:56 +08:00
xiongziliang	94806b2cd6	初步实现hls播放器个数计数	2019-12-28 16:48:11 +08:00
xiongziliang	20d56b713f	性能优化	2019-12-28 13:39:25 +08:00
xiongziliang	aaab52c94f	文件根目录httpRoot改成www，并且自动复制到相应目录	2019-12-27 12:15:38 +08:00