3034 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ziyue	89d0a9dedf	屏蔽动态添加配置文件的特性	2021-06-08 14:49:32 +08:00
ziyue	9de39de88c	Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev	2021-06-08 14:41:52 +08:00
ziyue	edf9129f7e	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-06-08 14:40:51 +08:00
ziyue	511aa2207f	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit	2021-06-08 14:27:10 +08:00
ziyue	c4817c6d5f	GB28181单端口接收流支持多线程	2021-06-08 14:03:25 +08:00
ziyue	92736db5b2	适配zltoolkit	2021-06-08 11:29:32 +08:00
xgj	8721c5a62b	for joy4 rtmp push onMetaData compatibility	2021-06-08 10:07:51 +08:00
xgj	bb37bce3ac	update zlmrtcclient.js	2021-06-07 18:40:47 +08:00
xgj	0f3a8f4a9d	fix webrtc to rtmp multi slice on frame error	2021-06-07 17:32:28 +08:00
xgj	d74779dc02	set server config can dynamic add config for add multi ffmpeg cmd template	2021-06-04 18:06:40 +08:00
baiyfcu	2ee7f67b5b	修复windows set FD 1024未生效BUG#898	2021-05-31 16:51:43 +08:00
ziyue	c3354a3df6	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-05-31 14:18:48 +08:00
ziyue	5eb00d5fab	修复windows下获取errno失败导致崩溃的bug:#889	2021-05-26 16:26:09 +08:00
ziyue	8f62365847	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-05-26 10:43:52 +08:00
夏楚	3b4e7619ad	Merge pull request #865 from yapingcat/master ... fix bug rtcp sr包的 ssrc 和rtp包中ssrc的不一致	2021-05-22 11:04:50 +08:00
xiongziliang	f034dbf1fa	Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev	2021-05-22 10:26:21 +08:00
xiongziliang	9f223bc7a2	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-05-22 10:25:05 +08:00
xiongziliang	975c11b74c	支持http响应无content-length字段的情况:#850	2021-05-22 10:22:56 +08:00
xiongziliang	7067472a18	转协议支持全局关闭音频:#883	2021-05-22 10:17:52 +08:00
xiongziliang	b7e6bfb574	hook接口在http头中附带vhost:#872	2021-05-22 09:53:31 +08:00
xiongziliang	7641db4225	getMediaList等接口返回录制状态:#876	2021-05-22 09:31:59 +08:00
xiongziliang	f54e02f511	修复http文件服务器相关bug	2021-05-22 09:28:19 +08:00
xiongziliang	8cbec43ee8	合并代码	2021-05-22 09:26:49 +08:00
xiongziliang	a391d1e289	修复rtsp推流带参相关的bug:#840	2021-05-22 09:25:24 +08:00
xiongziliang	08d4edddb0	修复http文件服务器相关bug	2021-05-22 09:13:00 +08:00
ziyue	d74589945a	还原	2021-05-19 18:39:23 +08:00
yapingcat	3c49b3737e	fix bug rtcp sr包的 ssrc 和rtp包中的一致	2021-05-17 09:20:03 +08:00
xiongziliang	5b57b9d6ae	确保rtc播放不强引用rtsp直播源	2021-05-16 22:13:08 +08:00
xiongziliang	44b0e13ba7	完善打印svc tid	2021-05-16 22:12:26 +08:00
xiongziliang	c6d2b41d97	完善rtp ext相关处理方法	2021-05-16 21:49:46 +08:00
xiongziliang	5f05df98b0	添加获取类型方法	2021-05-16 21:17:55 +08:00
xiongziliang	a84bcec4aa	完善rtp ext处理相关逻辑	2021-05-16 20:56:03 +08:00
xiongziliang	bda378c340	完善发送rtx rtp处理	2021-05-16 18:06:34 +08:00
xiongziliang	7cdd5ed9df	修复rtx包未修改rtp ext id的问题	2021-05-16 16:59:12 +08:00
xiongziliang	d4ff84e447	完善ssrc相关处理	2021-05-16 16:12:10 +08:00
xiongziliang	f6eb84b413	添加ssrc相关方法	2021-05-16 12:28:50 +08:00
xiongziliang	d395d23eeb	由于在RtspSession类确保了函数执行顺序，所以回滚多余代码也能确保单track流迅速注册	2021-05-15 10:05:47 +08:00
xiongziliang	4cd618899b	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-05-15 10:02:58 +08:00
xiongziliang	259e9dab07	更新ZLToolKit	2021-05-15 09:59:36 +08:00
xiongziliang	125b703ea9	Merge remote-tracking branch 'origin/master'	2021-05-15 09:57:21 +08:00
xiongziliang	e807a08f2e	单track rtsp推流加快媒体注册速度	2021-05-15 09:56:35 +08:00
ziyue	a7cd4d0719	rtp ext不做内存拷贝	2021-05-13 01:29:55 +08:00
xiongziliang	0e968a2d5e	更新ZLToolKit	2021-05-12 23:48:13 +08:00
ziyue	5f13335166	关闭丢包测试代码	2021-05-12 20:53:37 +08:00
ziyue	8fdfc14f6f	整理 nack/rtx/ssrc	2021-05-12 20:51:51 +08:00
ziyue	12be56493e	优化代码	2021-05-12 15:41:50 +08:00
xia-chu	cb280e1eeb	rtc推流支持nack/rtx重传	2021-05-11 15:48:01 +08:00
xia-chu	0d61de758e	完善nack与丢包重传2	2021-05-11 12:12:28 +08:00
xia-chu	5c90a1e137	完善nack与丢包重传	2021-05-11 11:18:55 +08:00
xia-chu	cbafdbabc6	防止拷贝	2021-05-11 09:09:35 +08:00