484 commits

Author	SHA1	Message	Date
winlin	596686f7b7	Merge branch '4.0release' into merge/develop	2021-05-15 08:51:51 +08:00
winlin	ddd7a378b1	Rename SrsRtpPacket2 to SrsRtpPacket. 4.0.111	2021-05-15 08:47:09 +08:00
winlin	72a48f6115	Merge branch '4.0release' into merge/develop	2021-05-14 18:15:41 +08:00
winlin	717e811002	Change virtual public to public. 4.0.109	2021-05-14 09:13:15 +08:00
winlin	cd45750c9d	RTC: Eliminate unused stat API	2021-05-14 08:56:41 +08:00
winlin	d4da7133e4	Merge branch '4.0release' into merge/develop	2021-05-11 19:11:03 +08:00
winlin	8c5a435714	Fix print bug in retrieve_local_ips. 4.0.107	2021-05-11 19:04:43 +08:00
winlin	73f8d64215	Merge branch '4.0release' into merge/develop	2021-05-10 18:09:09 +08:00
winlin	6dc93fe0a8	RTC: Update benchmark data	2021-05-10 14:30:08 +08:00
winlin	92d95a500f	Merge branch '4.0release' into merge/develop	2021-05-08 11:32:51 +08:00
winlin	b1e85664a1	Refine init of global SrsPps	2021-05-08 11:11:13 +08:00
winlin	56446825dc	Merge branch '4.0release' into merge/develop	2021-04-20 19:02:17 +08:00
winlin	cec0191b16	Happy 2021	2021-04-20 19:00:14 +08:00
winlin	2ea19a20dd	Merge 4.0	2021-04-16 09:28:53 +08:00
winlin	d01e603b25	Happy 2021	2021-04-16 09:25:55 +08:00
winlin	4f1d213c91	Live: Support follow HTTP/302 for HTTP/HTTPS FLV edge.	2021-03-17 16:53:39 +08:00
winlin	35431749c4	Live: Support follow client protocol for edge.	2021-03-17 16:48:18 +08:00
winlin	cec588e08a	For #2188: Remove sendmmsg from ST.	2021-03-02 19:31:33 +08:00
winlin	6dac180627	Kernel: Never depends on another globals for global variables	2021-03-02 19:30:56 +08:00
winlin	d8ba72fdc5	Kernel: Extract SrsPps to kernel	2021-03-02 19:30:52 +08:00
winlin	34dae0fe0d	For #2188: Remove sendmmsg from ST.	2021-02-26 09:13:21 +08:00
winlin	1909cfb3ff	Kernel: Never depends on another globals for global variables	2021-02-25 14:06:18 +08:00
winlin	20df644a05	Kernel: Extract SrsPps to kernel	2021-02-25 13:46:52 +08:00
winlin	5b8eea8cc5	Stat: Fix build fail for stat of timer and dispose	2021-02-19 19:08:16 +08:00
xialixin@kanzhun.com	fdaee20b81	For #2200, Enable RTC and FLV for GB28181	2021-02-19 18:54:12 +08:00
winlin	c0fda42743	For #2194, Support ST yield	2021-02-19 18:53:08 +08:00
winlin	d8563398b2	Clock: Update stat. Insert timer to execute first	2021-02-19 18:53:02 +08:00
winlin	bddc787a16	Refine the pps.	2021-02-19 18:52:35 +08:00
winlin	181c9f25ed	Live: Support connect origin by HTTP-FLV/HTTPS-FLV	2021-02-19 18:16:05 +08:00
xialixin@kanzhun.com	4df6fa540f	For #2200, Enable RTC and FLV for GB28181	2021-02-18 21:51:49 +08:00
winlin	76d6449317	For #2194, Support ST yield	2021-02-11 21:14:45 +08:00
winlin	321f555e30	Clock: Update stat. Insert timer to execute first	2021-02-11 17:34:03 +08:00
winlin	99b4866717	Refine the pps.	2021-02-10 21:20:49 +08:00
winlin	77cffd3e04	Main: Refine sever manager.	2021-02-10 16:16:56 +08:00
winlin	826546d518	Refine pps add SrsPps	2021-02-10 15:57:29 +08:00
winlin	ee1d06c613	Main: Refine sever manager.	2021-02-09 12:44:56 +08:00
winlin	b4282a6ee1	Fix build fail	2021-02-07 21:39:09 +08:00
winlin	a43f339aa6	Update server stat for cid	2021-02-07 21:33:24 +08:00
winlin	102434b3d5	Context: Use key of thread to store context	2021-02-07 21:31:39 +08:00
winlin	668f8cbf6c	Refine pps add SrsPps	2021-02-06 18:05:04 +08:00
winlin	bfa156247c	Merge branch '4.0release' into develop	2021-01-07 17:47:54 +08:00
winlin	1c41f5d796	Merge SRS3, change id of stat to string	2021-01-07 17:04:11 +08:00
winlin	fb7c051833	Change id from int to string for the statistics. 3.0.157	2021-01-07 16:47:49 +08:00
winlin	03389f5e8c	Merge branch '4.0release' into develop	2020-12-27 12:56:45 +08:00
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	8fa093c53c	Merge branch '4.0release' into develop	2020-12-26 22:18:45 +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	f9444c376c	Merge SRS4	2020-12-24 18:51:04 +08:00