8570 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	1fc31f4967	Merge branch '4.0release' into merge/develop	2021-10-21 09:02:42 +08:00
winlin	6aac93dd30	Merge branch 'develop' into merge/develop	2021-10-21 09:02:37 +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
winlin	2c38478d7d	Merge branch '4.0release' into merge/develop	2021-10-20 09:13:09 +08:00
winlin	ce9edb9166	Merge branch 'develop' into merge/develop	2021-10-20 09:13:05 +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
winlin	46e1eada2d	Merge branch '4.0release' into merge/develop	2021-10-18 15:09:30 +08:00
winlin	fb7ad33dd8	Merge branch 'develop' into merge/develop	2021-10-18 15:09:25 +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
winlin	37cd894042	Merge branch '4.0release' into merge/develop	2021-10-16 08:06:53 +08:00
winlin	ff50ffd3ea	Merge branch 'develop' into merge/develop	2021-10-16 08:06:48 +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	f7c32b45fd	Actions: Refine release message	2021-10-15 10:04:43 +08:00
winlin	9517ef123d	Squash: Update SRS 4.0 version	2021-10-14 18:33:31 +08:00
winlin	5003067aa9	Merge branch '4.0release' into merge/develop	2021-10-13 19:57:03 +08:00
winlin	761820e0ec	Merge branch 'develop' into merge/develop	2021-10-13 19:56:58 +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	65d947f3fb	Merge branch '4.0release' into merge/develop	2021-10-13 09:02:03 +08:00
winlin	eacaf61ac7	Merge branch 'develop' into merge/develop	2021-10-13 09:01:59 +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
winlin	6e22f7df3c	Merge branch '4.0release' into merge/develop	2021-10-12 15:08:57 +08:00
winlin	772e6fd98a	Merge branch 'develop' into merge/develop	2021-10-12 15:08:49 +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	e09acf2c67	Update	2021-10-12 14:03:27 +08:00
winlin	b1b823a9b7	Merge branch 'develop' into merge/develop	2021-10-12 14:02:48 +08:00
winlin	5d5df7923b	Config: If docker.conf does not exists, try srs.conf	2021-10-12 14:02:35 +08:00
winlin	219198d0ee	Release 4.0 dev6, v4.0.176, 143675 lines.	2021-10-12 09:20:46 +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	d30145d500	Merge branch '4.0release' into merge/develop	2021-10-12 08:34:22 +08:00