2070 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
xiongziliang	4f42f508d5	复用代码	2020-09-26 09:39:38 +08:00
夏楚	2ae97a66ea	Update README.md	2020-09-22 16:07:11 +08:00
monktan	9aff554719	Merge remote-tracking branch 'upstream/master' into master	2020-09-22 15:49:22 +08:00
monktan	d3be28b1a9	Merge remote-tracking branch 'upstream/master' into master	2020-09-21 15:50:15 +08:00
xiongziliang	efdc105b40	减少内存拷贝，提升性能	2020-09-21 14:56:58 +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	06f1731bca	添加作者	2020-09-21 10:29:51 +08:00
xiongziliang	ab74a185a0	更新第三方库	2020-09-20 23:27:26 +08:00
xiongziliang	29eec742e1	添加新作者	2020-09-20 23:05:13 +08:00
xiongziliang	adb3be70d0	添加GB28181相关c api: #491	2020-09-20 21:23:33 +08:00
xiongziliang	08a5891bdc	修复url解析相关bug	2020-09-20 20:15:39 +08:00
xiongziliang	016ca9465f	添加bom头	2020-09-20 19:50:08 +08:00
xiongziliang	d971eccf92	新增支持HTTP-fMP4 WebSocket-fMP4直播	2020-09-20 19:45:37 +08:00
xiongziliang	4ce1a25f09	修复MP4解复用时不写入adts头的问题	2020-09-20 19:45:21 +08:00
xiongziliang	071d0a9fd1	提炼MP4相关接口和代码	2020-09-20 19:45:04 +08:00
xiongziliang	2dd1046131	合并fmp4和mov接口	2020-09-20 19:44:20 +08:00
xiongziliang	d3cb0e3d39	ts直播源注销时关闭播放器	2020-09-20 00:57:34 +08:00
xiongziliang	2d0cf5cdd9	解决http-ts直播与hls直播冲突的问题	2020-09-20 00:55:22 +08:00
xiongziliang	c76930e3cd	支持http-ts/websocket-ts直播	2020-09-20 00:21:46 +08:00
xiongziliang	f84981dc75	合并pr(添加录制ts完成通知): #479	2020-09-20 11:40:42 +08:00
xiongziliang	0fce108de5	Merge branch 'feature/on-record-ts' of https://github.com/wasphin/ZLMediaKit into pr	2020-09-20 11:01:45 +08:00
xiongziliang	5104252474	修复HLS直播结束后，最后一个切片无法写入的问题	2020-09-20 10:56:54 +08:00
xiongziliang	100af97d51	修复死锁问题:#486	2020-09-20 10:43:25 +08:00
xiongziliang	07ef417250	优化HLS直播相关代码	2020-09-20 10:13:15 +08:00
xiongziliang	380a0204b1	替换docker镜像	2020-09-20 10:09:13 +08:00
xiongziliang	9c873e1d19	去除转协议开关参数	2020-09-20 09:26:00 +08:00
monktan	01ec9d4b13	新增hls追加录制，新增转推	2020-09-17 20:59:33 +08:00
wxf	748bb8e488	统一 mp4 及 ts 录像信息定义	2020-09-15 19:09:26 +08:00
wxf	b22a6e3dbd	添加 ts 切片是否通知选项, 默认为不通知	2020-09-15 17:46:12 +08:00
xiongziliang	00a7414f67	Merge remote-tracking branch 'origin/master'	2020-09-14 14:39:27 +08:00
xiongziliang	84b84ab979	update readme	2020-09-14 14:39:10 +08:00
wxf	188e087fc2	添加 hls ts 切片录制完成通知	2020-09-14 13:20:45 +08:00