3769 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
明月惊鹊	2bb9003ac5	修正Release 和 Debug编译选项 ... 根据传入的 -DCMAKE_BUILD_TYPE=Release 或者Debug， 或者不写（默认是Debug） 来决定生成何种编译文件。	2021-09-29 17:06:11 +08:00
haorui wang	adc6f652bd	修复zlm推流FMS,修正zlm的RTMP协议 (#1140) ... * 修复zlm推流FMS,修正zlm的RTMP协议 Co-authored-by: 夏楚 <771730766@qq.com>	2021-09-29 16:57:19 +08:00
xiongziliang	1292ec6d49	未指定编译类型时,强制为Debug编译	2021-09-29 01:18:58 +08:00
xiongziliang	4ff206fa42	兼容一些不规范的rtsp sdp: #1128	2021-09-29 01:16:52 +08:00
xiongziliang	892e151063	响应http head命令后不关闭socket:#1136	2021-09-29 00:46:09 +08:00
xiongziliang	50c45d7897	删除不必要的文件或代码	2021-09-29 00:41:39 +08:00
xiongziliang	146fdf48d4	新增作者	2021-09-29 00:41:10 +08:00
xiongziliang	8d2d1e135c	修改rtsp点播ntp时间戳	2021-09-29 00:25:34 +08:00
xiongziliang	b1666eb651	实现媒体源pause/speed接口:#1129	2021-09-29 00:16:56 +08:00
xiongziliang	507eadf20b	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2021-09-28 22:49:59 +08:00
xiongziliang	7d1b2583e6	优化代码	2021-09-28 22:44:02 +08:00
xiongziliang	305d9bc259	完善twcc rtcp包相关代码	2021-09-28 22:44:02 +08:00
cgm	8b1bccdd00	api增加log日志文件参数设置	2021-09-28 09:52:29 +08:00
ziyue	10c4608630	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2021-09-27 20:14:32 +08:00
ziyue	c09eb48724	修复udp服务器启动失败时访问空指针的bug	2021-09-27 20:11:39 +08:00
夏楚	16411e1af1	Merge pull request #1137 from ZLMediaKit/feature/add_mute_audio	2021-09-27 16:55:19 +08:00
ziyue	3bc0769ccb	完善mk_media接口	2021-09-27 14:34:26 +08:00
ziyue	c493f0da1b	完善添加静音音频相关功能	2021-09-27 14:12:11 +08:00
ziyue	e20718fbde	确保静音音频track不影响后续添加的正常音频track	2021-09-27 13:27:07 +08:00
ziyue	afec4b62b9	全局自动添加静音音频	2021-09-27 13:20:34 +08:00
ziyue	e9008afca0	addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口	2021-09-27 13:12:53 +08:00
ziyue	1f99708548	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2021-09-24 18:09:30 +08:00
ziyue	00f01afec7	修复webrtc相关漏洞:#1110	2021-09-24 11:29:04 +08:00
夏楚	07b0536f72	Merge pull request #1126 from johzzy/feature/ccache ... 增加ccache编译加速	2021-09-22 17:46:57 +08:00
Johnny	1d648e9ae5	增加ccache编译加速	2021-09-22 17:37:56 +08:00
夏楚	03aa9290ab	Merge pull request #1112 from ZLMediaKit/feature/update_rtcsdkdemo ... update zlm rtc sdk demo	2021-09-17 14:08:00 +08:00
xgj	ef213f16a7	warning when access rtc demo when http site and auto get url of site to anti mistake operation	2021-09-17 11:59:01 +08:00
xgj	e2cc9ecd92	update zlm rtc sdk demo	2021-09-17 11:20:23 +08:00
夏楚	2b3d32f6c6	Merge pull request #1108 from brokensword2018/fix_warning ... 去除非第三方库的编译告警	2021-09-16 17:39:55 +08:00
hejilin	dcb775c6e8	去除非第三方库的编译告警	2021-09-16 16:00:46 +08:00
ziyue	0514278ce6	修复webrtc播放不能秒开的问题	2021-09-16 10:47:49 +08:00
ziyue	dfa9001ed1	优化代码	2021-09-16 10:05:04 +08:00
ziyue	3d64f7253c	优化webrtc性能	2021-09-16 10:03:28 +08:00
ziyue	0aec2ee1c0	修复WebRtcTransport对象使用时释放导致崩溃的问题	2021-09-15 20:41:34 +08:00
ziyue	2b5cad97cf	完善webrtc相关对象生命周期管理逻辑	2021-09-15 20:08:18 +08:00
ziyue	3034f19a66	完善http直播url解析逻辑	2021-09-15 15:31:00 +08:00
ziyue	704ea59502	修复无人观看主动关闭webrtc推流线程安全的问题	2021-09-15 14:56:58 +08:00
ziyue	3c4285a056	提高webrtc代码健壮性	2021-09-15 11:50:15 +08:00
ziyue	869a707c04	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2021-09-14 16:27:50 +08:00
ziyue	83ee396405	全局关闭音频时，加快单视频流注册速度	2021-09-14 16:27:11 +08:00
夏楚	57d30b7797	Merge pull request #1104 from ZLMediaKit/feature/k8s-build ... 添加k8s部署相关说明	2021-09-14 09:55:27 +08:00
monktan	004c62bea4	添加k8s部署相关说明	2021-09-13 21:16:22 +08:00
夏楚	4c2b323731	Merge pull request #1102 from ZLMediaKit/xia-chu-patch-1 ... Update README.md	2021-09-13 15:38:02 +08:00
夏楚	b28d3ad9ae	Update README.md	2021-09-13 15:37:35 +08:00
ziyue	8af98817e1	修复低版本sdl,test_player编译问题	2021-09-13 10:38:32 +08:00
xiongziliang	fec1307a9d	修复连接迁移时，重复创建UdpSession的bug	2021-09-10 22:59:54 +08:00
xiongziliang	684cd21ba1	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2021-09-10 22:40:53 +08:00
xiongziliang	d2a0b1e3e6	基本完成webrtc单端口改造	2021-09-10 22:39:15 +08:00
ziyue	7ba44d1ac8	webrtc单端口模式支持线程安全，支持链接迁移	2021-09-10 18:37:32 +08:00
夏楚	e17192d332	Merge pull request #1093 from Dw9/patch-1	2021-09-08 20:17:01 +08:00