7997 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	d0c32d413e	Merge branch 'develop' into merge/develop	2021-10-12 08:34:17 +08:00
winlin	d6064ac608	UTest: Fix utest fail for config	2021-10-11 23:28:37 +08:00
winlin	29cf13afa0	Fix #1641, HLS/RTC picture corrupt for SPS/PPS lost. v4.0.175	2021-10-11 23:16:05 +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	fe9e43b6d4	RTC: Refine config for RTC	2021-10-11 16:36:05 +08:00
winlin	0b99f06eff	Test: Add RTMP to RTC regression test.	2021-10-11 09:34:08 +08:00
winlin	f8b4121497	Test: Add Multiple Sequence test for RTMP	2021-10-11 08:04:12 +08:00
winlin	29b98c49cc	Test: Refine RTMP regression test.	2021-10-10 18:41:14 +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	f41e79e010	Merge	2021-10-10 12:04:50 +08:00
winlin	d1d068da28	Merge branch 'develop' into merge/develop	2021-10-10 12:03:47 +08:00
winlin	2fa5a0bee8	Fix #2304, Remove Push RTSP feature. v4.0.171	2021-10-10 11:50:07 +08:00
winlin	9edf63bd30	3rdparty: Sync httpx-static	2021-10-10 11:37:19 +08:00
winlin	df53c801b2	For #2653: Update config for HTTP RAW API removed.	2021-10-10 10:28:19 +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	2ac214fdc6	For #2654: Parse width and width from SPS/PPS. v4.0.169	2021-10-08 22:18:02 +08:00
bepartofyou	286a605c63	Fix #2654: Parse width and width from SPS/PPS. Fix #471, #1335, #2539, #1316, #1421	2021-10-08 22:04:13 +08:00
winlin	55d8cb4b7b	Default to log to console for docker. v4.0.168	2021-10-08 21:58:33 +08:00
winlin	4c087b9376	Refine docker images for ossrs/srs:v4	2021-10-08 21:26:46 +08:00
winlin	1acb80b9c8	Enable WebRTC for srs.conf	2021-10-08 21:22:34 +08:00