151 commits

Author	SHA1	Message	Date
winlin	1df2ea5ca8	Merge branch '3.0release' into 4.0release	2020-12-27 12:56:28 +08:00
winlin	831c78062b	Remove vhost in query if not present it	2020-12-27 12:55:27 +08:00
winlin	2538b02a9b	Merge branch '3.0release' into 4.0release	2020-12-26 22:15:37 +08:00
winlin	6e43ef6866	For RTMP edge/forward, pass vhost in tcUrl, not in stream. 3.0.156	2020-12-26 22:11:23 +08:00
winlin	991ef94535	Merge branch '3.0release' into 4.0release	2020-09-14 20:52:11 +08:00
winlin	905444a1c7	For #1684, Prevent stop ingest for multiple times. 3.0.143	2020-09-14 20:48:44 +08:00
chenchengbin	0aecc063e0	防止ingester多次调用stop导致崩溃	2020-09-14 20:44:47 +08:00
winlin	a826926073	SRS: Fix bug	2020-08-21 21:14:18 +08:00
winlin	2b725b8167	Fix bug	2020-08-20 18:46:11 +08:00
HuyaJohn	d1d16d490e	Detect B frame in avc stream. Fix compiler error with verbose	2020-03-18 16:27:31 -07:00
winlin	c1e07d6a96	For #1634, always check status in thread loop. 3.0.126	2020-03-12 08:59:13 +08:00
winlin	0e750ab3eb	For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100	2020-01-16 14:28:05 +08:00
winlin	d783a12f89	Happy 2020	2019-12-30 10:10:35 +08:00
winlin	5a3fd1e68a	Release v3.0-a2, 3.0.67	2019-12-01 19:24:17 +08:00
winlin	517974d451	Refine redirect flow for origin cluster	2019-11-30 19:06:41 +08:00
winlin	e436cc5665	Refine SrsBasicRtmpClient in time unit.	2019-04-22 08:03:12 +08:00
winlin	33c66b64c5	Refine name TMMS to TIMEOUT	2019-04-18 07:47:35 +08:00
winlin	feb34ed225	Refine SrsStSocket in time unit	2019-04-17 09:21:38 +08:00
winlin	d3dc45f357	Refine set_recv_timeout in time unit	2019-04-17 08:31:53 +08:00
winlin	a1398892d0	Refine const timeouts in time unit	2019-04-17 08:08:31 +08:00
winlin	c1b64ba24f	Refine get_queue_length and set_queue_size in time unit	2019-04-16 07:55:19 +08:00
winlin	92980a0ca2	Refine SRS_CONSTS_RTMP_TMMS in time unit	2019-04-11 09:18:20 +08:00
winlin	5b0e0d0838	Refine SRS_CONSTS_RTMP_PULSE_TMMS in time unit	2019-04-11 08:43:42 +08:00
winlin	170872135d	Refine get_publish_1stpkt_timeout in time unit	2019-04-10 07:53:09 +08:00
winlin	6239dfa489	Apply time unit	2019-04-07 16:25:52 +08:00
winlin	b2d1d84634	Change to 2019	2019-01-01 21:37:28 +08:00
winlin	68a1656e07	Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35	2018-08-02 09:17:49 +08:00
winlin	a66d450ec1	For #1031, SRS edge support douyu.com. 3.0.34	2018-08-02 07:14:06 +08:00
winlin	586899a010	For #1031, SRS edge support douyu.com. 2.0.250	2018-08-02 06:59:57 +08:00
winlin	681138d2af	Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27	2018-02-13 08:52:57 +08:00
winlin	ca1395a807	Change date from 2017 to 2018	2018-01-07 10:58:53 +08:00
winlin	6eae93258a	For #913, APP support complex error.	2018-01-01 19:39:57 +08:00
winlin	9802dc326e	For #913, source support complex error	2017-09-23 22:12:33 +08:00
winlin	5c9a12e72a	For #913, use complex error for listener	2017-07-29 12:45:17 +08:00
winlin	9db2a04c3b	For #913, coroutine support complex error.	2017-06-11 18:44:20 +08:00
winlin	7cac35a289	For #913, source cycle error	2017-06-11 09:40:07 +08:00
winlin	9ca36970aa	Fix #908, use empty coroutine to avoid NULL pointer.	2017-06-04 19:13:56 +08:00
winlin	1bf99e8f3e	For #907, Wrap ST, only use in service ST.	2017-05-30 09:05:02 +08:00
winlin	6993ac226f	For #906, #902, use coroutine for reusable2 thread	2017-05-29 20:49:29 +08:00
HungMingWu	815d50f00a	Remove warning: C++11 requires a space between string literal and macro (#874) ... On Ubuntu 17.04, the default gcc compiler version is 6.3.0. It switch standard from c++98 to c++11. So it would generate verbose warnings.	2017-05-06 14:05:22 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	8c01f52372	for #738, refine the dvr segmenter.	2017-02-06 18:33:26 +08:00
winlin	5c959fc781	merge from srs2, for kbps free io	2017-01-22 13:16:05 +08:00
winlin	6706bda42c	for #752, release the io then free it for kbps. 2.0.232	2017-01-22 13:12:56 +08:00
winlin	3fe338d1c5	for #742, use ms for application clock tbn.	2017-01-17 12:25:30 +08:00
winlin	dca9749f37	for #742, refine the object live cycle. 3.0.15	2017-01-17 10:44:13 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	2941328ee8	rtmp edge support 302 redirect.	2016-01-11 15:46:23 +08:00
winlin	f516636448	refine code for hooks and http core.	2015-12-29 18:33:02 +08:00