1724 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	1169f29ca6	fixed #175	2019-12-17 09:05:34 +08:00
xiongziliang	1cc6a0dce5	fixed #175	2019-12-17 09:04:10 +08:00
xiongziliang	0670f9f62b	更新ios编译方法	2019-12-16 17:12:24 +08:00
xiongziliang	5322a5761b	修复时间戳跳跃可能导致的问题	2019-12-16 16:17:52 +08:00
xiongziliang	3f12c0ccde	修复时间戳覆盖的累积误差	2019-12-16 15:49:52 +08:00
xiongziliang	c353c626c1	1、根据PS获取时间戳 ... 2、修复rtp代理可能花屏的问题	2019-12-16 11:00:40 +08:00
xiongziliang	bfa9a3b678	#include <ctime>	2019-12-13 16:29:26 +08:00
xiongziliang	caf8274026	更新ZLToolKit	2019-12-13 16:20:03 +08:00
xiongziliang	e6235e00e1	修复windows下无法编译的问题	2019-12-13 16:17:15 +08:00
xiongziliang	6d697daeb0	去除FrameMerger逻辑	2019-12-13 15:49:57 +08:00
xiongziliang	14ba899c61	选择是否导出调试文件	2019-12-13 15:43:24 +08:00
xiongziliang	6e59000265	修复过滤多余帧类型导致的bug	2019-12-13 15:42:58 +08:00
xiongziliang	bd8a9a78e8	rtp代理防止时间戳回环	2019-12-13 15:42:12 +08:00
xiongziliang	fbf0f63503	1、getMediaList接入添加tracks、readerCount字段 ... 2、添加getMediaInfo接口	2019-12-13 13:35:27 +08:00
夏楚	89b8d461db	Merge pull request #167 from gemfield/master ... Fix Docker timezone issue, and also expose RTP port	2019-12-12 23:02:59 +08:00
xiongziliang	d9a5de5a63	修复持续集成编译失败问题	2019-12-12 23:02:11 +08:00
xiongziliang	5fe5dd9de6	hls保存ts文件时根据日期、时间保存	2019-12-12 22:58:31 +08:00
xiongziliang	ee66d945e8	更新media-server库	2019-12-12 22:25:55 +08:00
Gemfield	0adfb3ec83	Fix Docker timezone issue, and also expose RTP port	2019-12-12 20:07:21 +08:00
xiongziliang	2a518493d7	完善rtp测试工具	2019-12-11 20:01:51 +08:00
xiongziliang	99c1dd339f	修复adts头相关bug	2019-12-11 09:29:10 +08:00
xiongziliang	df73eb2c10	getSsrcInfo接口ssrc使用16进制字符串	2019-12-09 18:15:02 +08:00
xiongziliang	fa4fac1e0d	rtp推流由配置文件决定是否默认录制	2019-12-09 17:49:00 +08:00
xiongziliang	655a30081b	修复rtp(tcp)获取ssrc失败的bug	2019-12-06 20:18:08 +08:00
xiongziliang	adf0e09262	mp4点播支持pts	2019-12-06 17:23:49 +08:00
xiongziliang	030d8f6d53	完成windows下编译	2019-12-06 13:53:28 +08:00
xiongziliang	1300e11507	完善cmakelist	2019-12-06 13:39:55 +08:00
xiongziliang	0d9bdec182	支持rtp代理服务器	2019-12-06 11:54:10 +08:00
Gemfield	55814070f8	Update CMakeFiles for RTP Proxy	2019-12-05 19:53:55 +08:00
Gemfield	55d258fafc	Add rtp server	2019-12-05 19:20:12 +08:00
xiongziliang	10dc254510	完善stopRecord接口	2019-12-05 14:31:44 +08:00
xiongziliang	055c312579	修复getRecordStatus接口	2019-12-05 14:12:22 +08:00
xiongziliang	8502ed27c4	修复录制http ap接口	2019-12-05 12:55:43 +08:00
xiongziliang	69c0c3e237	添加录制相关http api	2019-12-05 12:04:08 +08:00
xiongziliang	f581f0f2a7	优化精简录制相关代码	2019-12-05 10:47:23 +08:00
xiongziliang	6eb4d5916d	修复bug	2019-12-04 19:19:03 +08:00
xiongziliang	33047ddc94	程序退出前停止一切录制	2019-12-04 19:15:48 +08:00
xiongziliang	728fd55e0c	修复无法延后录制的bug	2019-12-04 18:58:19 +08:00
xiongziliang	ae230bc1aa	优化代码	2019-12-04 18:53:12 +08:00
xiongziliang	57043138d8	优化代码	2019-12-04 18:49:22 +08:00
xiongziliang	e69cbc1486	优化代码	2019-12-04 18:46:31 +08:00
xiongziliang	996ff47d26	Merge remote-tracking branch 'origin/master'	2019-12-04 18:36:57 +08:00
xiongziliang	b3fcb4c038	重写mp4录制驱动机制	2019-12-04 18:36:30 +08:00
夏楚	a79bee1d88	Update README_CN.md	2019-12-04 12:11:36 +08:00
xiongziliang	d5a81d7105	规范命名	2019-12-04 10:59:13 +08:00
xiongziliang	de77460621	修复编译失败问题	2019-12-04 10:52:26 +08:00
xiongziliang	de33d6a847	整理文件录制	2019-12-04 10:45:38 +08:00
xiongziliang	2c2e7262d6	修复bug	2019-12-03 16:14:52 +08:00
xiongziliang	5249c24430	整理MediaSource代码	2019-12-03 16:10:02 +08:00
xiongziliang	68718953d4	优化代码	2019-12-03 13:05:23 +08:00