5662 commits

Author	SHA1	Message	Date
winlin	f5c9996c59	Merge	2021-04-24 19:40:33 +08:00
winlin	6f66cf0868	Player: Change the default from RTMP to HTTP-FLV.	2021-04-24 19:38:49 +08:00
winlin	5232f9e043	Disable CherryPy by --cherrypy=off. 4.0.90	2021-04-24 19:26:24 +08:00
winlin	de1c7522f0	SquashSRS3: Add console	2021-04-24 19:07:37 +08:00
winlin	9ed7565789	SquashSRS3: Package srs-console	2021-04-24 17:51:05 +08:00
winlin	56446825dc	Merge branch '4.0release' into merge/develop	2021-04-20 19:02:17 +08:00
winlin	cec0191b16	Happy 2021	2021-04-20 19:00:14 +08:00
winlin	2ea19a20dd	Merge 4.0	2021-04-16 09:28:53 +08:00
winlin	124455be09	Update script	2021-04-16 09:27:47 +08:00
winlin	d01e603b25	Happy 2021	2021-04-16 09:25:55 +08:00
winlin	263ead07f0	Merge branch 'develop' into merge/develop	2021-04-09 07:20:57 +08:00
winlin	78af396c76	Merge branch '4.0release' into merge/develop	2021-04-09 07:20:53 +08:00
stone	6da91f7dea	For #2275, fix bug for transcode engine config param.	2021-04-09 07:19:31 +08:00
winlin	a8fbae9e0a	Merge 4.0	2021-04-06 11:21:15 +08:00
winlin	aae0f61165	RTC: Eliminate the dup code	2021-04-06 10:56:40 +08:00
winlin	6efa5b37e1	Merge branch '4.0release' into merge/develop	2021-04-06 10:50:57 +08:00
winlin	061f367a82	RTC: Fix RTC connection dispose bug	2021-04-06 10:50:23 +08:00
winlin	1ee77614fb	Refine comments	2021-04-05 12:14:26 +08:00
winlin	237c1e4d3d	SquashSRS4: Fix DTLS warnings for HTTP api	2021-04-05 08:29:29 +08:00
winlin	79a357a945	Merge branch '4.0release' into merge/develop	2021-04-05 08:28:48 +08:00
winlin	db7e820f04	RTC: Fix DTLS warnings for HTTP api	2021-04-05 08:28:16 +08:00
winlin	fcf72b48f9	SquashSRS4: Fix republish bug	2021-04-04 19:05:44 +08:00
winlin	30b1fa650c	Merge	2021-04-04 19:05:10 +08:00
winlin	ee978c319a	Merge branch '4.0release' into merge/develop	2021-04-04 19:04:43 +08:00
winlin	96003d4a52	RTC: Fix bug for republish stream. 4.0.89	2021-04-04 19:01:42 +08:00
winlin	52644f50c9	SquashSRS4: Fix republish bug	2021-04-04 18:50:59 +08:00
winlin	bae7484d53	Merge branch '4.0release' into merge/develop	2021-04-04 18:48:48 +08:00
winlin	8d9dd532b9	RTC: Fix bug for republish stream. 4.0.89	2021-04-04 18:35:02 +08:00
winlin	d80ba9d284	SquashSRS4: Fix memory leak	2021-04-01 17:35:40 +08:00
winlin	d455e594b9	Merge branch '4.0release' into merge/develop	2021-04-01 17:35:06 +08:00
winlin	3c59fedab6	RTC: Fix memory leak	2021-04-01 17:34:47 +08:00
winlin	fa2fec3247	SquashSRS4: Refine payload NALU type parser	2021-04-01 14:48:41 +08:00
winlin	cc1cab2803	Merge branch '4.0release' into merge/develop	2021-04-01 14:47:48 +08:00
winlin	7823d75a38	RTC: Refine payload NALU type parser	2021-04-01 14:46:28 +08:00
winlin	0cc3063703	SquashSRS4: Refine TWCC and SDP exchange. 4.0.88	2021-04-01 10:55:03 +08:00
winlin	bf7118df27	SquashSRS4: Refine TWCC and SDP exchange. 4.0.88	2021-04-01 10:53:44 +08:00
winlin	aa5d872b8c	RTC: Refine TWCC and SDP exchange. 4.0.88	2021-04-01 10:50:20 +08:00
winlin	bd1752a4b2	RTC: Fix TWCC send bug	2021-04-01 10:47:50 +08:00
winlin	7ac4a4f4ca	RTC: Fix audio track description bug	2021-04-01 10:24:37 +08:00
winlin	f4b791a9d5	Kernel: Never assert for SrsBuffer::require	2021-04-01 10:22:07 +08:00
winlin	4d5c7e0a73	RTC: Fix object cache bug, reset payload when recycle	2021-04-01 10:21:19 +08:00
winlin	45b83bd22e	SquashSRS4: Update comments and performance data	2021-03-31 18:25:12 +08:00
winlin	ae0871d696	Merge branch '4.0release' into merge/develop	2021-03-31 18:24:10 +08:00
winlin	f2d0c34244	RTC: Refine comments for SrsRtpPacket2	2021-03-31 17:46:45 +08:00
winlin	4692e8b8ad	SquashSRS4: Support WebRTC re-publish stream.	2021-03-26 14:59:25 +08:00
winlin	6aed86f852	Merge branch '4.0release' into merge/develop	2021-03-26 14:58:30 +08:00
winlin	d6c16a7e23	RTC: Support WebRTC re-publish stream. 4.0.87	2021-03-24 20:12:31 +08:00
winlin	aab54b2cf4	SquashSRS4: Refine RTC extension ID parsing	2021-03-24 19:00:42 +08:00
winlin	10c6e7dc98	Merge branch '4.0release' into merge/develop	2021-03-24 19:00:08 +08:00
winlin	0cb05a2953	RTC: Refine ID parsing	2021-03-24 18:58:01 +08:00