134 Commits

Author	SHA1	Message	Date
xiongziliang	8a8da61ef5	防止windows下字符编码错误	2020-04-08 13:54:44 +08:00
xiongziliang	e5d5cabf89	部分恢复录制相关接口	2020-04-05 09:26:29 +08:00
xiongziliang	7019e4717c	整理授权协议	2020-04-04 20:30:09 +08:00
xiongziliang	cefb2a7cc4	hls/mp4录制不再能随时开启或关闭	2020-04-04 14:33:12 +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	a7a376b3f2	流量汇报事件添加id参数	2020-02-13 12:10:08 +08:00
xiongziliang	7e25537957	流量汇报事件添加客户端ip和端口参数	2020-02-13 11:33:59 +08:00
xiongziliang	89e191f7fd	添加接口：getMp4RecordFile	2020-02-01 23:26:33 +08:00
xiongziliang	e8ba94ba09	还原代码	2020-02-01 22:58:21 +08:00
liuziloong	2384aa5bbd	MP4录像增加一级目录，按照：年月/年月日/*.mp4存储； ... 增加按月，按天查询mp4录像； 消除一处编译器警告；	2020-01-20 15:02:45 +08:00
liuziloong	ee2ca4bda5	Merge branch 'master' into research	2020-01-19 15:09:34 +08:00
liuziloong	d2d84680c0	temp	2020-01-19 14:54:31 +08:00
xiongziliang	cbd6cd4e60	替换不可调试的宏代码	2020-01-17 11:44:20 +08:00
Luke	81d3e54d45	mark	2020-01-16 11:08:15 +08:00
Luke	dad0175094	Merge branch 'master' into research	2020-01-14 11:39:43 +08:00
Luke	2d9537ec84	snap	2020-01-14 10:36:38 +08:00
xiongziliang	835d6bd9b5	允许本机和超级用户任意访问http目录	2020-01-09 17:03:29 +08:00
xiongziliang	9cdbe4c4ef	修复协议转换配置开关不生效的bug	2020-01-07 15:38:35 +08:00
xiongziliang	5258169a07	修复协议转换配置开关不生效的bug	2020-01-07 15:37:48 +08:00
xiongziliang	16751ddf04	windows支持FFmpeg拉流代理	2020-01-07 15:10:59 +08:00
xiongziliang	77bbc7ae4d	Merge remote-tracking branch 'FreeNVR/freenvr' ... # Conflicts: # server/FFmpegSource.cpp # server/Process.cpp # server/Process.h # server/System.cpp	2020-01-07 15:08:15 +08:00
xiongziliang	9c42c5ed8c	windows视频FFmpeg拉流代理	2020-01-07 14:37:18 +08:00
Luke	306e202ca1	1.添加windows下ffmpeg拉流分发支持，目前不是很完善，后续再修改 ... 2.server/system下未兼容完成	2020-01-07 11:09:11 +08:00
xiongziliang	e4f9e377c5	修复FFmpeg日志路径相关的bug	2020-01-03 17:26:36 +08:00
Gemfield	e31c1ee207	Add optional customized_path parameter for startRecord	2020-01-02 12:47:12 +08:00
xiongziliang	7e1e367844	优化FFmpeg拉流失败重试机制	2019-12-29 17:14:23 +08:00
xiongziliang	345db4b999	优化代码	2019-12-29 15:43:51 +08:00
xiongziliang	e91c26c052	实现hls的流量汇报事件	2019-12-29 15:38:29 +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	e72fa359b6	完善hls播放器个数计数	2019-12-28 16:57:35 +08:00
xiongziliang	94806b2cd6	初步实现hls播放器个数计数	2019-12-28 16:48:11 +08:00
xiongziliang	e663ddd9a6	简化事件参数	2019-12-24 14:08:16 +08:00
xiongziliang	fbf0f63503	1、getMediaList接入添加tracks、readerCount字段 ... 2、添加getMediaInfo接口	2019-12-13 13:35:27 +08:00
xiongziliang	df73eb2c10	getSsrcInfo接口ssrc使用16进制字符串	2019-12-09 18:15:02 +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
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	33047ddc94	程序退出前停止一切录制	2019-12-04 19:15:48 +08:00
xiongziliang	de33d6a847	整理文件录制	2019-12-04 10:45:38 +08:00
xiongziliang	5249c24430	整理MediaSource代码	2019-12-03 16:10:02 +08:00
xiongziliang	12346f77a4	修复编译问题	2019-11-30 11:44:05 +08:00
xiongziliang	5e9291e035	添加启动失败处理逻辑	2019-11-29 11:27:54 +08:00
xiongziliang	d587ddf7ef	添加服务器启动报告	2019-11-29 10:12:20 +08:00
xiongziliang	85cd4a7d02	修复遍历删除可能崩溃的bug	2019-11-19 10:55:44 +08:00