2294 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	9e93561c77	只有linux平台打开链接顺序无关选项	2021-04-11 11:53:05 +08:00
xiongziliang	5fadd2665d	非windows平台，才忽略静态库链接顺序	2021-04-11 11:44:16 +08:00
xiongziliang	bbe67e928e	Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev	2021-04-11 11:42:45 +08:00
xiongziliang	e094a0bcae	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-04-11 11:41:27 +08:00
xiongziliang	65f072a82b	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit	2021-04-11 11:40:22 +08:00
xiongziliang	271b180004	修复流注册事件track和regist字段缺失的bug	2021-04-11 11:39:49 +08:00
xgj	1739980989	Merge remote-tracking branch 'china/dev' into dev	2021-04-11 09:15:22 +08:00
xiongziliang	012f58d27c	添加rtp 调试接口	2021-04-11 01:15:02 +08:00
xiongziliang	33da2e28ec	修复pt覆盖失败的bug	2021-04-11 01:14:41 +08:00
xgj	ebf650cf4f	fix static library link order	2021-04-10 22:24:26 +08:00
xiongziliang	e495dfca64	修复忽略g711a(pt=0)的bug	2021-04-10 21:58:27 +08:00
xiongziliang	5b7974a522	添加版权信息	2021-04-09 20:44:47 +08:00
xiongziliang	b180ea0609	删除测试代码	2021-04-09 20:42:05 +08:00
xiongziliang	f1c22c478f	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-04-09 20:19:59 +08:00
夏楚	9b57edff09	webrtc supported	2021-04-09 20:10:57 +08:00
夏楚	e899064b2a	添加webrtc相关描述	2021-04-09 19:58:40 +08:00
xia-chu	7378650620	修复windows下获取ssrc失败的bug	2021-04-09 12:15:32 +08:00
xia-chu	38894097ae	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-09 10:47:14 +08:00
夏楚	67eb75048c	Update README.md	2021-04-08 18:11:21 +08:00
xia-chu	67e1b1f194	媒体注册hook添加编码等信息	2021-04-08 17:34:46 +08:00
xiongziliang	b2afae0e8a	暂时屏蔽一些日志	2021-04-07 21:02:28 +08:00
xiongziliang	1650f63af5	生成answer sdp失败时，立即销毁对象	2021-04-07 20:41:17 +08:00
xiongziliang	fb9eefca69	完善日志	2021-04-07 20:40:42 +08:00
xiongziliang	87e1209d0a	修复某些平台下，udp connect后sendto时指定对端地址发送失败的问题	2021-04-07 20:33:53 +08:00
xia-chu	a22a6bafb7	添加流量统计事件	2021-04-07 18:35:38 +08:00
xia-chu	0c5fa36e4d	rtc推流添加媒体事件相关接口	2021-04-07 18:18:27 +08:00
xia-chu	155c59e17e	添加rtc类型的推流	2021-04-07 18:17:49 +08:00
xia-chu	b96052d387	完善rtc异常管理	2021-04-07 17:51:47 +08:00
xia-chu	d354c9466c	rtc添加对rtcp bye支持	2021-04-07 17:21:59 +08:00
xia-chu	f374f72312	添加rtcp bye相关代码	2021-04-07 16:58:05 +08:00
xiongziliang	79267ae551	比对codec失败时，先关闭profile比对，再关闭codec比对	2021-04-06 23:47:54 +08:00
xiongziliang	b5e6c12ee8	H264 profile比对不区分大小写	2021-04-06 23:46:45 +08:00
xiongziliang	c9a20eda16	profile匹配失败时，优先选择相同编码格式的方案	2021-04-06 23:22:22 +08:00
xiongziliang	204ef6e204	匹配H264 profile	2021-04-06 23:21:46 +08:00
xiongziliang	a42b56ba94	兼容Firefox	2021-04-06 22:51:16 +08:00
ziyue	b5bf930467	调整cmake	2021-04-06 18:30:36 +08:00
ziyue	9c552128a7	修复sdp中没ssrc时触发的bug	2021-04-06 18:29:14 +08:00
ziyue	8edd093d68	添加bom头	2021-04-06 17:23:13 +08:00
xiongziliang	50ca789c0c	预留同时推流拉流的接口	2021-04-05 11:32:38 +08:00
xiongziliang	606f251311	修复音频相关的bug	2021-04-05 11:07:41 +08:00
xiongziliang	ce04a7279c	优化代码	2021-04-05 00:12:46 +08:00
xiongziliang	3c935e7fdd	优化代码	2021-04-05 00:06:21 +08:00
xiongziliang	6070654860	rtc播放时，比对采样率等信息	2021-04-04 23:58:59 +08:00
xiongziliang	fe02f2cf1c	rtc推流和播放添加事件触发	2021-04-04 23:20:10 +08:00
xiongziliang	49d8e2f825	http请求最大允许40KB数据	2021-04-04 23:17:11 +08:00
xiongziliang	09add8d351	修改为捕捉摄像头	2021-04-04 23:14:42 +08:00
xiongziliang	5f0aeaa32a	区分推流和播放	2021-04-04 23:13:01 +08:00
xiongziliang	f33d3ba175	还原配置文件	2021-04-04 23:12:35 +08:00
xiongziliang	c70721a520	修改rtp pt时，确保不影响其他播放器	2021-04-04 21:42:11 +08:00
xiongziliang	2abb5078f9	实现rtc转rtsp	2021-04-03 09:34:49 +08:00