2053 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	c5f1b4cd52	程序退出时清空RtpProcess对象	2020-10-24 23:29:44 +08:00
xiongziliang	fd898254f2	修复fu rtp打包的bug	2020-10-24 23:29:21 +08:00
xiongziliang	84784f21c4	优化性能	2020-10-24 23:28:56 +08:00
xiongziliang	02c4aa3f4b	优化代码	2020-10-24 23:28:25 +08:00
monktan	e95ed256ea	optimize log	2020-10-23 09:47:14 +08:00
monktan	b49d377293	Merge remote-tracking branch 'upstream/master' into master	2020-10-20 15:57:14 +08:00
monktan	fe46ccc53f	Merge remote-tracking branch 'upstream/master' into master	2020-10-20 11:28:52 +08:00
xiongziliang	44bb1ba5ef	rtp端口取偶数:#526	2020-10-20 10:38:31 +08:00
xiongziliang	130c411ae4	修复添加track太晚导致的bug: #528	2020-10-20 10:21:35 +08:00
xiongziliang	46ee7f369b	防止误删gop缓存	2020-10-20 00:06:59 +08:00
xiongziliang	c9d7cd99a3	修复线程安全相关bug:#521	2020-10-20 11:50:18 +08:00
monktan	231cd2e79f	merge upstream	2020-10-19 20:27:42 +08:00
monktan	734cd06a48	update rtp sort	2020-10-19 16:57:40 +08:00
monktan	6f977a1c14	Merge remote-tracking branch 'upstream/master' into master	2020-10-19 12:18:00 +08:00
xiongziliang	b7d6442870	tcp情况下，rtp长度不得超过2K，防止发送端存在缓存覆盖的bug	2020-10-18 23:05:24 +08:00
xiongziliang	ac381350f3	更新readme	2020-10-18 21:39:43 +08:00
xiongziliang	e3364e9029	优化代码	2020-10-18 21:39:22 +08:00
xiongziliang	51fcaeda4c	更新第三方库	2020-10-18 21:33:36 +08:00
xiongziliang	fcf641dfb6	优化rtp排序算法	2020-10-17 14:46:59 +08:00
monktan	12e71fc67a	Merge remote-tracking branch 'upstream/master' into master	2020-10-12 10:03:03 +08:00
xiongziliang	2965248346	修复std::move后智能指针无效的问题	2020-10-10 18:44:48 +08:00
xiongziliang	209689121a	消除编译警告	2020-10-10 18:36:29 +08:00
xiongziliang	dfaa8b540c	使用临时变量和std::move减少智能指针的拷贝构造	2020-10-10 18:23:25 +08:00
monktan	b6a82c372a	Merge remote-tracking branch 'upstream/master' into master	2020-10-09 19:20:12 +08:00
monktan	5c8446bc62	修改暂停接口返回值	2020-10-09 15:12:05 +08:00
monktan	03bf2486ae	Merge remote-tracking branch 'upstream/master' into master	2020-10-09 09:41:43 +08:00
xiongziliang	83a24a5863	删除过期配置项	2020-10-01 21:45:09 +08:00
xiongziliang	4d39176877	重写rtp排序算法:#510	2020-10-01 21:33:07 +08:00
xiongziliang	6a8268f323	添加配置项 mediaServerId	2020-10-01 20:58:19 +08:00
xiongziliang	c968769a13	update README.md	2020-10-01 20:20:40 +08:00
xiongziliang	bc36e000b3	提炼rtp排序算法	2020-10-01 19:02:14 +08:00
xiongziliang	eee65a51ce	修复FFmpeg截图可能失败的问题	2020-10-01 19:01:48 +08:00
xiongziliang	d047392be0	修复无法关闭FFmpeg子进程的问题	2020-10-01 18:49:36 +08:00
xiongziliang	a1de3bfd30	添加流创建时间、在线时间	2020-10-01 18:57:15 +08:00
xiongziliang	cd27e5a9f9	注意！hls mp4录制的customized path字段改成录制根目录 相当于配置文件中hls mp4录制根目录相关设置	2020-10-01 14:55:34 +08:00
xiongziliang	8b7c792e44	更新	2020-10-01 14:53:22 +08:00
xiongziliang	728dd3ec3c	合并pr:#509	2020-10-01 14:53:15 +08:00
xiongziliang	eccb1a664c	Merge branch 'dev' of https://github.com/chatop2020/ZLMediaKit	2020-10-01 13:39:19 +08:00
xiongziliang	e26f997225	修改参考案例	2020-10-01 11:58:16 +08:00
xiongziliang	d78d753429	添加网速统计功能	2020-10-01 11:02:13 +08:00
xiongziliang	7f3877e437	添加网速统计功能	2020-10-01 11:02:00 +08:00
夏楚	719bbee954	Update README.md	2020-09-30 10:30:28 +08:00
qiuzhouwei	4132df89cd	增加了服务器id,修改了record.cpp中mp4录制的自定义录制路径，ffmpegsource中的超时时间，webhook中的唯一id等	2020-09-28 10:45:59 +08:00
monktan	0d63db5a9a	Merge remote-tracking branch 'upstream/master' into master	2020-09-27 20:18:59 +08:00
xiongziliang	bae52db6ba	修复关闭某些功能后，编译失败的问题	2020-09-27 16:54:55 +08:00
monktan	fbecb7f5f4	添加rtp pause接口，目前默认3分钟	2020-09-27 16:51:35 +08:00
monktan	09d2472f6b	Merge remote-tracking branch 'upstream/master' into master	2020-09-27 15:15:01 +08:00
xiongziliang	5cd8e8ae1c	添加媒体生成源信息	2020-09-27 11:32:49 +08:00
monktan	c4e28fb894	Merge remote-tracking branch 'upstream/master' into master	2020-09-27 10:55:34 +08:00
xiongziliang	2cf66594e8	解决截图失败的问题	2020-09-26 10:07:22 +08:00