116 Commits

Author	SHA1	Message	Date
monktan	8e575c0c78	解决合并冲突	2020-11-24 14:49:21 +08:00
xiongziliang	408a678ade	修复编译问题：#584	2020-11-21 22:32:01 +08:00
monktan	a1fe5ee817	merge upstream	2020-10-25 17:48:37 +08:00
xiongziliang	67e49cb66e	修复close stream接口返回code不正确的问题	2020-10-24 23:31:40 +08:00
xiongziliang	c5f1b4cd52	程序退出时清空RtpProcess对象	2020-10-24 23:29:44 +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	a1de3bfd30	添加流创建时间、在线时间	2020-10-01 18:57:15 +08:00
xiongziliang	7f3877e437	添加网速统计功能	2020-10-01 11:02:00 +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
monktan	d3be28b1a9	Merge remote-tracking branch 'upstream/master' into master	2020-09-21 15:50:15 +08:00
xiongziliang	416d21df36	返回值去除std::move	2020-09-21 14:32:56 +08:00
monktan	0b33bc1888	合并主分支	2020-09-21 11:01:02 +08:00
xiongziliang	9c873e1d19	去除转协议开关参数	2020-09-20 09:26:00 +08:00
monktan	01ec9d4b13	新增hls追加录制，新增转推	2020-09-17 20:59:33 +08:00
xiongziliang	040c132fb6	优化stopSendRtp接口返回值	2020-09-06 18:24:48 +08:00
xiongziliang	51ae8d4083	复用忽略协议查找流的相关代码	2020-09-06 18:19:54 +08:00
xiongziliang	09e484794b	实现ps-rtp的发送 #366	2020-09-06 17:56:05 +08:00
xiongziliang	461b5da933	修复closeRtpServer接口相关bug:#447	2020-08-08 12:20:44 +08:00
xiongziliang	d6d861c401	openRtpServer接口不允许添加重复的stream_id	2020-07-09 10:57:17 +08:00
xiongziliang	363673dd00	完善getRtpInfo接口	2020-07-09 10:41:17 +08:00
xiongziliang	4b39fd487d	动态创建rtp端口采用stream_id为索引	2020-07-09 10:38:57 +08:00
xiongziliang	b2ff53037b	http api新建的rtp服务器可以自动超时移除	2020-07-08 10:25:30 +08:00
xiongziliang	477f99b756	支持动态创建GB28181收流端口并可指定stream_id:#338	2020-07-07 10:01:12 +08:00
xiongziliang	2be19ffb31	添加listRtpServer接口	2020-07-02 22:26:38 +08:00
xiongziliang	b603b8a68d	支持http api动态添加或关闭rtp服务器	2020-07-02 22:23:43 +08:00
xiongziliang	9c646d1316	完善预设截图相关逻辑	2020-06-10 10:50:37 +08:00
xiongziliang	cecfe7ba54	截图api支持默认图片	2020-06-10 10:33:48 +08:00
xiongziliang	ebc1ee2c6e	代码优化	2020-05-28 12:44:25 +08:00
xiongziliang	ff7914e441	修改MediaSource相关接口	2020-05-26 10:11:58 +08:00
xiongziliang	abe1698601	防止重复创建截图	2020-05-09 09:39:36 +08:00
xiongziliang	5b4d4dab96	优化截图生成逻辑	2020-05-09 09:29:45 +08:00
xiongziliang	76bece0217	实现实时生成和获取截图的http api	2020-05-09 00:06:36 +08:00
xiongziliang	f222af2632	完善代码	2020-04-24 15:28:27 +08:00
xiongziliang	a9fcd9dbc1	完善接口	2020-04-23 23:57:42 +08:00
xiongziliang	787af5109e	api返回音视频相关信息	2020-04-23 23:45:20 +08:00
xiongziliang	b6946a5968	事件广播触发者改成SockInfo对象	2020-04-23 21:38:44 +08:00
xiongziliang	1d5c6cb141	整理解析器	2020-04-20 18:13:45 +08:00
xiongziliang	1f02144225	完善录制相关api错误提示	2020-04-16 21:31:07 +08:00
xiongziliang	6b621d42db	优化接口	2020-04-15 22:30:24 +08:00
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	1168174c2b	tab统一替换为4个空格键：#242	2020-03-20 11:51:24 +08:00
xiongziliang	89e191f7fd	添加接口：getMp4RecordFile	2020-02-01 23:26:33 +08:00