6238 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	88826aae8f	Rename SrsConnection to SrsTcpConnection	2020-09-11 16:59:22 +08:00
winlin	2135b638b1	Merge srs_app_thread.hpp to srs_app_conn.hpp	2020-09-11 16:44:40 +08:00
winlin	60c759919f	Refine code	2020-09-11 15:48:21 +08:00
winlin	697f7d5251	Merge branch 'develop' into feature/rtc	2020-09-10 19:39:25 +08:00
winlin	8b279a9ac4	Merge branch '4.0release' into develop	2020-09-10 19:38:02 +08:00
winlin	0cadbca52f	Merge SRS3	2020-09-10 19:36:55 +08:00
winlin	63b5c51748	RTC: Change SO_REUSEPORT fail to warning. 3.0.142	2020-09-10 19:35:04 +08:00
winlin	c5f7a90a68	RTC: Fix bug	2020-09-10 17:49:10 +08:00
winlin	2b99b43633	RTC: Fix bug	2020-09-10 17:48:28 +08:00
winlin	e19631a2b7	RTC: Refine PLI request as worker	2020-09-10 17:45:19 +08:00
winlin	4c459a004e	Log: Support tag for log	2020-09-10 11:07:21 +08:00
winlin	57288838d0	RTC: Logging for NACK timeout.	2020-09-10 10:50:59 +08:00
winlin	c708103cd4	RTC: Refine NACK RTT and efficiency. 4.0.42	2020-09-09 15:42:02 +08:00
winlin	dfa42cdd8c	RTC: Improve NACK RTT	2020-09-09 14:26:42 +08:00
winlin	d61536311b	RTC: Remove and refine NACK removing	2020-09-09 14:07:13 +08:00
winlin	f1df0704e8	RTC: Refine code	2020-09-09 13:59:16 +08:00
winlin	0e2f81f023	RTC: Improve NACK efficiency	2020-09-09 13:51:35 +08:00
winlin	cff976bb71	RTC: Improve NACK efficiency	2020-09-09 13:39:10 +08:00
winlin	3026f2fda8	Refine PLI/NACK/DTLS logs. 4.0.41	2020-09-08 13:37:23 +08:00
winlin	579f7a8a5b	RTC: Refine cid for PLI	2020-09-03 16:00:12 +08:00
winlin	a0dedba2ab	RTC: Fix NACK bug	2020-09-02 11:30:20 +08:00
winlin	5c6946f484	RTC: Refine DTLS alert close_notify log	2020-09-01 16:12:29 +08:00
winlin	b5296d82f4	RTC: Show dtls info	2020-09-01 11:14:41 +08:00
winlin	2cbc00bf61	RTC: Refine PLI log	2020-08-31 20:37:53 +08:00
winlin	2bc6632a22	Server: Add callback for logrotate	2020-08-31 15:09:33 +08:00
winlin	fa1ccaa9f2	Merge branch 'develop' into feature/rtc	2020-08-31 13:39:03 +08:00
winlin	5c2bd2c7f7	Merge branch '4.0release' into develop	2020-08-31 13:38:27 +08:00
winlin	08d2991b53	Fix GB28181 build fail	2020-08-31 13:38:06 +08:00
winlin	3363f39eba	Fix GB28181 build fail	2020-08-31 13:37:22 +08:00
winlin	89279f181c	Merge branch 'develop' into feature/rtc	2020-08-30 12:56:17 +08:00
yapingcat	23577763cd	把int64_t转成字符串 ... 通过http api 获取streams信息时id显示乱码，应该将int转化为字符串	2020-08-30 12:53:46 +08:00
yapingcat	794563145c	把int64_t转成字符串 ... 通过http api 获取streams信息时id显示乱码，应该将int转化为字符串	2020-08-30 12:53:46 +08:00
winlin	2f22a3d38b	For #1926, refine code	2020-08-30 12:43:55 +08:00
jasongwq	7e5572c5e1	FIX：When 28181 stream stopped，Stream API does not remove it	2020-08-30 12:42:23 +08:00
winlin	bbfbc97476	Merge branch 'develop' into feature/rtc	2020-08-30 12:38:47 +08:00
winlin	e4ea2be008	Fix serval bugs for RTC. Refine context API. 4.0.40	2020-08-30 12:26:42 +08:00
winlin	8722bd2e0c	Merge branch 'feature/rtc' into develop	2020-08-30 12:16:13 +08:00
winlin	c8eb667a04	Merge branch 'feature/gb28181' into develop	2020-08-30 12:15:58 +08:00
xialixin@kanzhun.com	82f1569f2a	When for traverses the device list, send invite and sleep to other threads to update the list, and the conflicting program exits	2020-08-30 12:06:34 +08:00
kyxlx550	d02b560217	remove 28181 is_aac define	2020-08-30 12:06:34 +08:00
kyxlx550	5864ea3472	supprot ps jitbuffer different timestamp of audio and video	2020-08-30 12:06:34 +08:00
winlin	b095c15720	Fix utest fail	2020-08-30 11:55:18 +08:00
winlin	ef8f3d6189	Refine cid for signal thread	2020-08-30 11:46:50 +08:00
winlin	7fed6e631a	Refine code	2020-08-30 10:13:23 +08:00
winlin	311cb77b36	Context: Refine API	2020-08-30 09:53:10 +08:00
winlin	cf428b8db4	RTC: Save parent cid for publish stream	2020-08-28 20:21:05 +08:00
winlin	34d119f7b4	RTC: Remove dead code	2020-08-28 20:09:09 +08:00
winlin	f8ad90c68d	RTC: Fix source init bug	2020-08-28 15:19:21 +08:00
winlin	d97c0f5db2	RTC: Refine NACK match and miss logs	2020-08-28 12:17:51 +08:00
winlin	8860d0ec62	RTC: Refine options	2020-08-28 11:19:21 +08:00