6061 commits

Author	SHA1	Message	Date
winlin	60d474b1da	Merge branch 'develop' into merge/develop	2021-11-04 07:36:24 +08:00
Haibo Chen	a01354a595	Edge: Refuse edge request when state is stopping (#2707)	2021-11-04 07:28:48 +08:00
winlin	fd7589a286	Merge	2021-10-30 12:26:15 +08:00
qingfuliao	60ab81a5c7	IDE: Fix build problem caused by ffmpeg/pthread dependency. (#2579)	2021-10-30 12:13:37 +08:00
马文武	54b706d36e	Script: Refine CentOS7 service script to restart SRS. v4.0.190 (#2552)	2021-10-30 12:09:22 +08:00
Abrar Ahmed	b9288668a7	SRT: Type from shoulde to should. (#2455) ... Change word typo from shoulde to should	2021-10-30 11:42:24 +08:00
HungMingWu	cc99226ed5	SRTP: Patch libsrtp2 to fix GCC10 build fail. v4.0.189	2021-10-30 08:40:25 +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	7c96146d21	Merge branch '4.0release' into merge/develop	2021-10-28 08:01:44 +08:00
winlin	ed1c499bd3	Gop: Ignore zero timestamp when shrinking. v4.0.187 (#2186)	2021-10-28 07:52:24 +08:00
winlin	e8380cda29	Demos: Remove the unused H5 demo files. (#2469)	2021-10-27 18:40:43 +08:00
winlin	e1f65478af	Sqush: Refine config for origin cluster	2021-10-27 17:34:03 +08:00
winlin	4bf8ab0f10	Merge branch '4.0release' into merge/develop	2021-10-27 17:07:58 +08:00
lvndry	e176401499	Cluster: Origin server shouldn't be it's own coworker. v4.0.186 (#1963)	2021-10-27 07:46:24 +08:00
winlin	3c4b9be76b	For #2689, Refine the patches for loongarch	2021-10-26 07:15:11 +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	a6c4cc9692	Squash: Merge SRS 4.0, API: Always stat client event if auth fail.	2021-10-24 20:58:34 +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
winlin	5b44cc6a17	For #2689, Support loongarch, loongson CPU. v5.0.19	2021-10-24 18:00:54 +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
winlin	665b5f48f7	Squash: JSON: Support escape special chars. (#1758)	2021-10-20 09:16:18 +08:00
xmedia-systems	34b968aabf	JSON: Support escape special chars. (#1758) v4.0.182	2021-10-20 08:57:40 +08:00
Matheus Macabu	061d544195	RTMP: If port is explicity set to 0, use default 1935 (#1754). v4.0.181	2021-10-19 08:24:37 +08:00
Matheus Macabu	9a017f4037	RTMP: If port is explicity set to 0, use default 1935 (#1754)	2021-10-19 08:20:28 +08:00
winlin	85131dad63	Squash: Update SRS 4.0 version	2021-10-18 15:10:05 +08:00
Alex.CR	bb7cd6af3a	SRT: Solve mpegts demux assert bug (#2670) v4.0.180 ... * solve mpegts demux bug * remove assert * add error log in mpegts demux * sovle compile problem Co-authored-by: shiwei <shiwei05@kuaishou.com>	2021-10-18 15:07:33 +08:00
Alex.CR	60c8724879	SRT: Solve mpegts demux assert bug (#2670) ... * solve mpegts demux bug * remove assert * add error log in mpegts demux * sovle compile problem Co-authored-by: shiwei <shiwei05@kuaishou.com>	2021-10-18 15:03:47 +08:00
winlin	596dd8c523	Support daemon(fork twice) for Darwin/OSX. v5.0.18	2021-10-17 16:53:39 +08:00
Haibo Chen	7fd5e8607c	DVR: support mp3 audio codec. (#2593) v5.0.17	2021-10-16 14:06:43 +08:00
winlin	e03ada39a1	Squash: SRS v4.0.179	2021-10-16 08:07:57 +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	9517ef123d	Squash: Update SRS 4.0 version	2021-10-14 18:33:31 +08:00
Alex.CR	1649386ed5	SRT: Pes error when mpegts demux in srt. v4.0.178 ... * solve mpegts demux bug * solve pes error when mpegts demux	2021-10-13 19:53:20 +08:00
Alex.CR	44f1d8ed6d	SRT: Pes error when mpegts demux in srt (#2671) ... * solve mpegts demux bug * solve pes error when mpegts demux	2021-10-13 19:51:05 +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
winlin	135bef2182	Test: Update srs-bench depends	2021-10-12 20:30:40 +08:00
winlin	e127880ec2	Squash: Merge SRS 4.0	2021-10-12 15:09:52 +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