3040 commits

Author	SHA1	Message	Date
winlin	1b1565b38a	Merge branch '4.0release' into merge/develop	2021-11-15 11:07:44 +08:00
winlin	93964bb037	ST: Print log when multiple thread stop one coroutine. (#1708)	2021-11-15 09:35:23 +08:00
winlin	ae13e784b4	Merge	2021-11-13 19:31:42 +08:00
john	469bd8cfe2	RTC: check audio track exist when negotiate (#2729)	2021-11-13 19:09:45 +08:00
john	878833bb95	Rtc2Rtmp: Using rtp timestamp to distinguish different video frame (#2721)	2021-11-09 07:35:00 +08:00
winlin	4cf4e8f06b	Merge branch '4.0release' into merge/develop	2021-11-07 18:49:23 +08:00
winlin	1f4dad024e	Config: Guess config files by FHS. v4.0.194 (#2711)	2021-11-07 17:39:58 +08:00
Haibo Chen	b06661539c	DVR: Copy req from publish. v4.0.193 (#2714) ... * DVR: copy req from publish * DVR: copy req from publish	2021-11-07 17:01:45 +08:00
Haibo Chen	3974b319d1	DVR: Copy req from publish (#2714) ... * DVR: copy req from publish * DVR: copy req from publish	2021-11-07 16:59:33 +08:00
winlin	84a16774b2	Fix build fail for CentOS6, without SO_REUSEPORT	2021-11-05 18:32:06 +08:00
winlin	523b055c06	Squash: Support RPM. Fix bugs.	2021-11-04 07:37:17 +08:00
Haibo Chen	27083430ce	Edge: Refuse edge request when state is stopping (#2707)	2021-11-04 07:30:30 +08:00
Haibo Chen	a01354a595	Edge: Refuse edge request when state is stopping (#2707)	2021-11-04 07:28:48 +08:00
john	2d6ec03c5b	RTC: Remove no need code when check sdp. (#2702)	2021-11-03 07:45:37 +08:00
winlin	ab5079909d	For #2369, #1708, #1941: Check errno when close fd or stop thread	2021-10-31 19:33:27 +08:00
winlin	8125dd4dd1	Forward: Fast quit when cycle fail. v4.0.188 (#2284)	2021-10-30 07:59:57 +08:00
winlin	da7fac0939	Release SRS v5.0.19, develop version, not stable	2021-10-28 08:06:26 +08:00
winlin	ed1c499bd3	Gop: Ignore zero timestamp when shrinking. v4.0.187 (#2186)	2021-10-28 07:52:24 +08:00
Haibo Chen	ced518ea92	STAT: Add server_id into http_hooks (#2692) v4.0.185	2021-10-25 14:14:06 +08:00
Haibo Chen	88cdba6965	STAT: Add server_id into http_hooks (#2692)	2021-10-25 14:11:15 +08:00
winlin	5783c4420f	For #2689: Support stat for CPU archs.	2021-10-24 18:45:47 +08:00
winlin	99904f9ec2	For #2689: Support stat for CPU archs.	2021-10-24 18:41:12 +08:00
Haibo Chen	592d4964ef	API: Always stat client event if auth fail. v4.0.183	2021-10-22 08:06:39 +08:00
Haibo Chen	a86f3905b2	Put the statistics code after http callback (#2687)	2021-10-22 08:03:49 +08:00
winlin	f0910cf9b7	Squash: For #1758: Fix bug for marshal JSON with SDP.	2021-10-21 09:03:17 +08:00
winlin	31693d4b61	For #1758: Fix bug for marshal JSON with SDP.	2021-10-21 07:36:01 +08:00
Haibo Chen	7fd5e8607c	DVR: support mp3 audio codec. (#2593) v5.0.17	2021-10-16 14:06:43 +08:00
Haibo Chen	3fc287f7de	API: Fix the same 'client_id' error when asynchronous call (#2665) v4.0.179	2021-10-16 07:53:18 +08:00
Haibo Chen	974bed6b26	API: Fix the same 'client_id' error when asynchronous call (#2665)	2021-10-16 07:50:47 +08:00
winlin	cd7e5a131e	Squash: SRS 4.0, Stat the oc(origin cluster).	2021-10-13 09:03:47 +08:00
winlin	18a155bf31	API: Stat the oc(origin cluster).	2021-10-13 08:13:00 +08:00
winlin	533e86eaf8	API: Stat the oc(origin cluster).	2021-10-12 21:40:46 +08:00
Haibo Chen	a2003b3a85	API: Use publish param instead of play (#2550) v4.0.177	2021-10-12 14:07:16 +08:00
Haibo Chen	579b90dc1e	on_dvr: use publish param instead of play (#2550)	2021-10-12 14:04:22 +08:00
winlin	4e6a3321cd	Squash: Merge SRS 4.0	2021-10-12 14:04:02 +08:00
winlin	5d5df7923b	Config: If docker.conf does not exists, try srs.conf	2021-10-12 14:02:35 +08:00
Haibo Chen	eb3bbf1bca	For #2549: Fix duration issue for HLS on_hls. v4.0.176	2021-10-12 09:18:39 +08:00
Haibo Chen	93cd025e2a	replace the placeholder of ts url in m3u8 (#2549)	2021-10-12 09:15:21 +08:00
winlin	b874d9c9ba	Squash: Merge SRS 4.0, regression test for RTMP.	2021-10-12 08:36:24 +08:00
winlin	71ed6e5dc5	RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174	2021-10-11 22:14:45 +08:00
winlin	9c315c94fc	For #1641, Support RTMP publish and play regression test. v4.0.173	2021-10-10 18:09:52 +08:00
winlin	0f9b9505a8	RTC: Change rtc.aac to discard by default. v4.0.172	2021-10-10 17:17:14 +08:00
winlin	a81aa2edc5	Squash: Merge SRS 4.0	2021-10-10 12:05:26 +08:00
winlin	2fa5a0bee8	Fix #2304, Remove Push RTSP feature. v4.0.171	2021-10-10 11:50:07 +08:00
winlin	cf99ebf186	Fix #2653: Remove HTTP RAW API. v4.0.170	2021-10-10 10:23:27 +08:00
winlin	19e857ada4	Remove dead link for issues	2021-10-10 09:31:06 +08:00
winlin	55d8cb4b7b	Default to log to console for docker. v4.0.168	2021-10-08 21:58:33 +08:00
winlin	5042117034	Squash: Merge SRS 4.0	2021-10-07 21:10:44 +08:00
ChenGH	7a4de9ffe7	Fix #2415, refine dtls fragment and rtp payload size (#2652)	2021-10-07 21:05:30 +08:00
ChenGH	0093a54b34	fix bandwidth kbps caculate bug (#2648)	2021-10-04 13:40:17 +08:00