3548 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	f384f5e025	解决死锁问题	2020-03-04 21:57:31 +08:00
xiongziliang	6cc56a758a	Merge remote-tracking branch 'origin/master'	2020-02-29 10:28:20 +08:00
xiongziliang	899dcc7386	修复拼写错误	2020-02-29 10:27:30 +08:00
夏楚	a245e6bec2	Update README.md	2020-02-28 23:08:44 +08:00
夏楚	0a4f2ad42c	Update README.md	2020-02-28 22:55:47 +08:00
xiongziliang	1e53500eb0	mk_media接口支持无人观看事件	2020-02-28 17:53:21 +08:00
xiongziliang	109fab2cb1	RTP代理支持完整的事件	2020-02-28 16:25:14 +08:00
xiongziliang	5acdf1f789	完善注释	2020-02-27 15:48:52 +08:00
xiongziliang	e6eee321ea	优化临界状态丢起始帧的问题	2020-02-27 12:31:57 +08:00
xiongziliang	38584a7478	添加mk_media_init_complete接口	2020-02-27 11:40:38 +08:00
xiongziliang	a0001bf2f4	优化日志友好度	2020-02-25 19:00:22 +08:00
xiongziliang	86b053db3b	优化代码	2020-02-25 18:53:11 +08:00
xiongziliang	d60101b93c	优化单Track情况下等待3秒的情况	2020-02-25 14:59:40 +08:00
xiongziliang	f76109c629	兼容ssrc为0的rtp推流	2020-02-23 12:16:20 +08:00
xiongziliang	618b028da4	修复拼写错误	2020-02-21 11:35:53 +08:00
xiongziliang	c56a0a0624	更新ZLToolKit	2020-02-18 21:13:30 +08:00
xiongziliang	2ecb9c6887	更新ZLToolKit	2020-02-18 11:25:39 +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	ead8b5a89c	ios默认只生成c静态库	2020-02-05 23:34:51 +08:00
xiongziliang	89e191f7fd	添加接口：getMp4RecordFile	2020-02-01 23:26:33 +08:00
xiongziliang	51e0c71007	添加更多录制相关方法	2020-02-01 22:58:58 +08:00
xiongziliang	e8ba94ba09	还原代码	2020-02-01 22:58:21 +08:00
xiongziliang	6a97fcb3de	媒体注册、重置事件改成同步触发	2020-02-01 22:57:48 +08:00
xiongziliang	075a615a92	Merge branch 'research' of https://gitee.com/liuziloong/FreeNVR	2020-02-01 21:20:57 +08:00
xiongziliang	92f69c3915	优化纯音频流的延时	2020-01-24 22:16:28 +08:00
xiongziliang	a9539eb626	HLS遇到I帧才切片:#226	2020-01-24 22:00:55 +08:00
xiongziliang	224a35dbd5	解决单音频无法录制mp4的bug	2020-01-24 21:09:47 +08:00
xiongziliang	90c6dd4bfa	修复关闭hls后无法编译通过的问题	2020-01-24 20:54:39 +08:00
xiongziliang	4470f2e427	添加addTrackCompleted方法，缩短流注册延时	2020-01-22 19:09:53 +08:00
xiongziliang	ac33592319	修复死锁的问题	2020-01-21 11:05:51 +08:00
xiongziliang	f5187e8b0d	优化GOP相关逻辑	2020-01-20 16:22:25 +08:00
xiongziliang	f453668683	去除侦探gop长度的逻辑	2020-01-20 15:34:06 +08:00
liuziloong	795860a019	修复目录级别错误	2020-01-20 15:22:20 +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
xiongziliang	22d5ec7796	Merge remote-tracking branch 'origin/master'	2020-01-15 20:00:05 +08:00
xiongziliang	95c8474d48	修复GOP缓存相关小bug	2020-01-15 19:59:47 +08:00
夏楚	114d447dac	Merge pull request #215 from gemfield/master ... Split Dockerfile to runtime and devel version	2020-01-15 15:31:14 +08:00
xiongziliang	caa870c37e	websocket服务器支持根据url选择不同的运行逻辑	2020-01-15 15:11:42 +08:00
xiongziliang	34e3e9f720	优化及时推拉流秒开成功率	2020-01-15 11:55:16 +08:00
xiongziliang	2610ba7c8b	修复rtmp注册时还未生成完整config包的bug	2020-01-15 11:46:15 +08:00
xiongziliang	444137e5b7	重写GOP缓存机制	2020-01-15 11:07:55 +08:00
xiongziliang	0a4b59031f	及时推拉流也能确保第一帧为关键帧	2020-01-14 19:41:55 +08:00
Gemfield	5ee913a3bf	Split Dockerfile to runtime and devel version, and also reduce the image size for runtime version	2020-01-14 19:36:42 +08:00
xiongziliang	a573d7302b	提高rtsp客户端兼容性	2020-01-14 18:11:10 +08:00
Luke	dad0175094	Merge branch 'master' into research	2020-01-14 11:39:43 +08:00