6226 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	eea36bc261	Merge branch '4.0release' into develop	2020-09-14 20:52:45 +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	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	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
winlin	1da97b7cde	Merge branch 'develop' into feature/rtc	2020-08-24 13:11:32 +08:00
winlin	02a597801f	Merge branch '4.0release' into develop	2020-08-24 13:11:05 +08:00
winlin	8609bcf344	Merge branch '3.0release' into 4.0release	2020-08-24 13:10:17 +08:00
winlin	18192f7efb	Update SRS to Simple-Realtime-Server	2020-08-24 13:08:21 +08:00
winlin	1c07aed2fc	Fix bugs	2020-08-21 21:23:32 +08:00
winlin	60aebb5ae3	SRS: Fix bug	2020-08-21 21:15:48 +08:00
winlin	a826926073	SRS: Fix bug	2020-08-21 21:14:18 +08:00
winlin	aaebecbcc9	RTC: Support UnifiedPlan	2020-08-21 18:08:54 +08:00
winlin	d66d100107	Refine code	2020-08-21 17:43:54 +08:00
莫战	aaf956a5c8	fix nack rtcp protect issue	2020-08-21 11:28:48 +08:00
winlin	2b725b8167	Fix bug	2020-08-20 18:46:11 +08:00
winlin	a2d9f0a9ad	Fix bug	2020-08-20 18:22:36 +08:00