5187 commits

Author	SHA1	Message	Date
winlin	61f62ceec6	Fix build warnings	2021-01-08 11:48:56 +08:00
winlin	473942c6f6	Kernel: Add utest for srs_string_split	2021-01-08 10:27:12 +08:00
winlin	8580b1e5fb	Merge branch '4.0release' into develop	2021-01-07 18:02:42 +08:00
winlin	f8266fe3b7	Add usage for --cherrypy=on|off when configure	2021-01-07 18:02:24 +08:00
winlin	bfa156247c	Merge branch '4.0release' into develop	2021-01-07 17:47:54 +08:00
winlin	6c7ffdeedf	Merge branch '3.0release' into 4.0release	2021-01-07 17:27:33 +08:00
winlin	d520679547	Refine code for changing id of stat to string	2021-01-07 17:27:30 +08:00
winlin	4f013404e3	Refine stat id	2021-01-07 17:09:33 +08:00
winlin	1c41f5d796	Merge SRS3, change id of stat to string	2021-01-07 17:04:11 +08:00
winlin	fb7c051833	Change id from int to string for the statistics. 3.0.157	2021-01-07 16:47:49 +08:00
johzzy	3c14a96bdd	fix: html5 video tag resolution adaptive. (#2128)	2021-01-07 13:47:30 +08:00
winlin	248085edfe	For #2109, Add more utest for srs_string_split	2021-01-07 12:30:51 +08:00
winlin	2492b726af	RTC: Fix memory leak	2021-01-07 11:45:03 +08:00
xbpeng121	47422b7819	GB28181: 无法对接平台问题及一些小bug (#2109) ... * 1-新增srs_string_split2函数，该函数支持空串也能按照原有顺序进行切分并放入数组 2-SrsGb28181Device增加属性字段，并在收到catalog命令时能够更新该属性 3-修复sip包解包不严谨bug(body中有可能会有SRS_RTSP_CRLFCRLF那么导致header_body[1]就不一定是body了可能只是body的一部分) * 1-修复停用rtp多路复用参数（invite_port_fixed）不起作用bug * bugfix: 当srs发送invite时会指定一个ssrc作为流媒体序列号，但有些平台发流时并不使用这个作为ssrc,而是自己新生成一个。（修复该bug是在invite response时解析内容中的sdp，把对方生成的流媒体序列号ssrc读出来，并且更新srs的channel映射） * Update push.gb28181.conf 恢复成原来的conf * bugfix,在取得muxer时需要更新。之前写反了 * Merge branch 'develop' into 4.0release * 解决冲突时，优先选择原有代码（还原选择develop的代码） * 解决冲突时，优先选择原有代码（还原选择develop的代码） * 解决冲突时，优先选择原有代码（还原选择develop的代码） * 解决冲突时，优先选择原有代码（还原选择develop的代码） * 修改sdp_map相同属性的连接符 * 解决冲突时，优先选择原有代码（还原选择develop的代码） * 修改sdp_map相同属性的连接符 * 解决冲突时，优先选择原有代码（还原选择develop的代码） * 解决冲突时，优先选择原有代码（还原选择develop的代码） * 回退原来代码 * 删除parse_sdp存储至map相关代码 * 格式恢复 * 格式恢复 * 恢复格式 * srs_string_split() 函数的bugfix Co-authored-by: xbpeng <xianbin.peng@sibat.cn>	2021-01-06 15:37:02 +08:00
winlin	6cf93557e1	RTC: Fix publish RTC ssrc bug	2021-01-06 12:15:04 +08:00
winlin	fbbdf5ba0e	RTC: Fix audio track NULL bug	2021-01-05 18:38:11 +08:00
winlin	040893efde	Add research for UDP binding	2021-01-05 18:30:39 +08:00
winlin	155587d2c1	RTC: Fix parse error stap playload crash bug	2021-01-05 10:56:05 +08:00
winlin	ebe38f7337	RTC: Fix RTX bug	2021-01-03 20:01:53 +08:00
winlin	78fcaaf7b1	RTC: Fix memory leak	2020-12-30 16:03:28 +08:00
winlin	03389f5e8c	Merge branch '4.0release' into develop	2020-12-27 12:56:45 +08:00
winlin	1df2ea5ca8	Merge branch '3.0release' into 4.0release	2020-12-27 12:56:28 +08:00
winlin	831c78062b	Remove vhost in query if not present it	2020-12-27 12:55:27 +08:00
winlin	8fa093c53c	Merge branch '4.0release' into develop	2020-12-26 22:18:45 +08:00
winlin	2538b02a9b	Merge branch '3.0release' into 4.0release	2020-12-26 22:15:37 +08:00
winlin	6e43ef6866	For RTMP edge/forward, pass vhost in tcUrl, not in stream. 3.0.156	2020-12-26 22:11:23 +08:00
winlin	f9444c376c	Merge SRS4	2020-12-24 18:51:04 +08:00
winlin	0ccbd7c40a	Support get schema for HTTP message	2020-12-24 18:49:56 +08:00
winlin	af8bf67606	Refine player	2020-12-24 17:19:33 +08:00
winlin	92588c0872	Merge branch '4.0release' into develop	2020-12-24 11:34:17 +08:00
winlin	18d049accc	Support disable CherryPy. 4.0.57	2020-12-24 11:33:49 +08:00
jinxue.cgh	7f081b4178	RTC: Refine TWCC from 200ms to 50ms	2020-12-23 15:13:21 +08:00
winlin	c3938ddfd2	Research: Add cost analysis	2020-12-22 19:24:35 +08:00
winlin	a4d1b3e2ca	Research: Add cost analysis	2020-12-22 17:36:18 +08:00
winlin	ec212b7413	Merge branch '4.0release' into develop	2020-12-21 12:06:25 +08:00
winlin	764909c6cf	Clear disposing then free resources to avoid reuse addresses	2020-12-21 12:05:56 +08:00
winlin	6afdf3addf	Merge branch '4.0release' into develop	2020-12-21 12:00:03 +08:00
winlin	e8fa92e3d1	Refine logs for resource manager	2020-12-21 11:59:35 +08:00
winlin	5949eee4f4	Keep resources when dispoing to avoid reuse addresses.	2020-12-21 11:56:22 +08:00
winlin	9217fad73b	Hotfix: Print resource address when manager dispose it	2020-12-21 11:28:58 +08:00
winlin	4d18835f3c	Fix build fail	2020-12-21 10:37:33 +08:00
winlin	90b61ad952	Merge SRS4	2020-12-18 10:14:26 +08:00
winlin	5ebf034aea	For #1694, Refine API for nb_bytes	2020-12-18 09:56:40 +08:00
winlin	c17474627b	Merge SRS3	2020-12-18 09:34:32 +08:00
winlin	25c76c1e8a	Fix #1694, Support DVR 2GB+ MP4 file. 3.0.155	2020-12-17 18:43:45 +08:00
winlin	576be75f00	Merge branch '4.0release' into develop	2020-12-17 12:28:04 +08:00
winlin	c97e943b07	Merge SRS3	2020-12-17 12:27:47 +08:00
winlin	ab5ddd24e2	Fix #1548, Add edts in MP4 for Windows10. 3.0.154	2020-12-17 12:07:34 +08:00
winlin	721173e6af	MP4: Fix warnings	2020-12-17 11:25:51 +08:00
winlin	1502560bcf	Update conf	2020-12-13 13:29:30 +08:00