external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
6389 commits 13 branches 107 tags 375 MiB
Commit graph

5117 commits

Author SHA1 Message Date
winlin
42a2dea5e0 Refine code 2020-09-30 11:14:49 +08:00
winlin
4ccb83834d Fix Kbps resample bug 2020-09-27 16:21:15 +08:00
winlin
99d9d02579 RTC: Print server stats every 5s 2020-09-27 16:10:24 +08:00
winlin
4795244716 Fix stat get time bug 2020-09-27 14:57:18 +08:00
jinxue.cgh
dc3756b8b2 RTC: Compatible with SSRC without mslabel. 2020-09-23 19:59:35 +08:00
winlin
fb6c2fdf80 RTC: Use event notify for stream source 2020-09-23 19:29:19 +08:00
jinxue.cgh
2b47b42213 RTC: Refine PLI request log. 2020-09-21 17:03:48 +08:00
winlin
1a33452e95 Refine resource manager, fix loop and context switching bug 2020-09-20 22:09:03 +08:00
winlin
033e2f9210 Add utest for resource manager 2020-09-20 21:10:48 +08:00
winlin
7e3dfa7149 GB28181: Fix build fail 2020-09-20 18:01:03 +08:00
winlin
4e2fca2b0f Fix utest fail 2020-09-19 12:37:39 +08:00
winlin
253aa23fb1 RTC: Extract resource manager. Use any UDP packet to keep alive. 4.0.43 2020-09-19 11:06:06 +08:00
winlin
7c682a99c9 RTC: Set to alive when got any packet 2020-09-19 11:04:54 +08:00
winlin
8bf677e3c8 Refine code 2020-09-19 10:53:55 +08:00
winlin
1661876633 Fix build fail 2020-09-19 10:41:58 +08:00
winlin
64705d1cc8 RTC: Refine resouce management 2020-09-19 10:30:05 +08:00
winlin
1173d35e33 RTC: Add api in track 2020-09-17 17:15:59 +08:00
winlin
a19aa82029 RTC: Refine log 2020-09-17 16:34:10 +08:00
winlin
5b3f278243 RTC: Refine log 2020-09-17 16:25:24 +08:00
winlin
7459f287e0 System: Add srs duration api 2020-09-17 12:52:16 +08:00
winlin
f7faa13dc5 RTC: Cover connection manager coroutine switch when dispoing conn 2020-09-17 11:44:16 +08:00
jinxue.cgh
27b85c7390 RTC: Fix clear zombie bug 2020-09-16 21:50:24 +08:00
winlin
2a3b5e5290 RTC: Fix mid generation bug 2020-09-16 19:59:49 +08:00
winlin
b4544acc11 Fix build fail 2020-09-16 19:56:06 +08:00
winlin
5ec5f98dcf RTC: Refine sdp for multiple streams 2020-09-16 19:41:34 +08:00
winlin
fe66755bab RTC: Init RTP extension types 2020-09-15 16:40:35 +08:00
winlin
9f31506c83 Refine code 2020-09-15 12:34:00 +08:00
winlin
c26cb9a15b RTC: Support update msid for sdp 2020-09-15 12:31:36 +08:00
winlin
c8af9e9ec4 RTC: Use transformed mid, not the mid of track. 2020-09-15 12:12:46 +08:00
winlin
783029778c Merge branch 'develop' into feature/rtc 2020-09-14 20:55:30 +08:00
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
69595089ee RTC: If not exists 42e01f, we pick up any profile such as 42001f. 2020-09-14 17:19:21 +08:00
winlin
dd7587c497 Dispose session when DTLS alert 2020-09-14 10:47:06 +08:00
winlin
86a80396de Add utest for connection manager 2020-09-13 13:08:49 +08:00
winlin
72122c746a Fix utest build fail 2020-09-13 11:01:34 +08:00
winlin
962c379299 Fix build fail 2020-09-13 10:41:37 +08:00
winlin
66c680edb1 Refine code, use SrsConnectionManager 2020-09-11 18:55:18 +08:00
winlin
33f1cb87a2 Refine conneciton manager 2020-09-11 17:26:02 +08:00
winlin
4eae93d27b Rename SrsCoroutineManager to SrsConnectionManager 2020-09-11 17:20:41 +08:00
winlin
d8a158290f Remove unused conn from consumer. 2020-09-11 17:03:48 +08:00
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
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
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
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
winlin
7dcfd6b029 Refine code 2020-08-20 18:05:40 +08:00
winlin
2c08c4d303 Fix bug 2020-08-20 17:48:14 +08:00
winlin
d3e739e61b Fix fd leak 2020-08-20 17:39:01 +08:00
winlin
7a9e89d7b3 Fix memory leak 2020-08-20 17:15:07 +08:00
winlin
b41ffed0a2 Refine code style 2020-08-20 16:16:35 +08:00
winlin
7810edd887 Refine code 2020-08-20 14:12:27 +08:00
winlin
afd20563ad Refine string dump to hex 2020-08-20 13:56:05 +08:00
winlin
a712e9cb3d RTC: Fix memory leak 2020-08-20 11:47:38 +08:00
winlin
0716fb4be2 HLS: Fix memory leak 2020-08-20 11:42:05 +08:00
winlin
6bc83e1041 HLS: Fix memory leak 2020-08-20 11:37:25 +08:00
winlin
036cc2a7a2 RTC: Limit the ARQ for DTLS 2020-08-19 21:28:06 +08:00
winlin
1ffea2bcc5 RTC: Refine code 2020-08-19 19:11:42 +08:00
winlin
306a0121ff RTC: Refine code 2020-08-19 19:09:31 +08:00
winlin
9416fddd2b RTC: Refine DTLS impl, extract client and server 2020-08-19 19:06:00 +08:00
winlin
5589120dc8 RTC: Fix bug 2020-08-19 17:48:59 +08:00
winlin
466813b7d5 RTC: Covert client ARQ for DTLS 2020-08-19 17:35:15 +08:00
winlin
e4b0dd56f0 RTC: Covert server ARQ for DTLS 2020-08-19 17:22:34 +08:00
winlin
f33c83a26f RTC: Fix warnings 2020-08-19 17:22:05 +08:00
winlin
f9e17577f7 RTC: Fix conn bug 2020-08-19 10:36:30 +08:00
winlin
1d17666641 RTC: Add utest for DTLS client 2020-08-19 10:31:46 +08:00
winlin
a3e912f5dc RTC: DTLS support ARQ, covered with utest. 4.0.39 2020-08-18 20:24:49 +08:00
winlin
307c644f18 Fix build fail 2020-08-18 19:35:35 +08:00
winlin
17bef0402e RTC: Fix error code for DTLS 2020-08-18 19:29:35 +08:00
winlin
c33dfd2313 RTC: Add utest for DTLS 2020-08-18 19:20:07 +08:00
winlin
9ca6b2e50f RTC: Refine DTLS 2020-08-18 14:45:30 +08:00
winlin
ab221fa842 RTC: Add callback for all consumers done 2020-08-17 20:08:11 +08:00
winlin
88d4314a3c RTC: Refine comment 2020-08-17 18:17:03 +08:00
winlin
66a0143f14 RTC: Refine source state to created and delivering 2020-08-17 18:15:34 +08:00
winlin
5afabe4adf RTC: Remove dead code 2020-08-17 17:47:26 +08:00
winlin
87ffb7071a RTC: Refine code 2020-08-17 17:31:53 +08:00
winlin
1114c6a46a RTC: Refine comments 2020-08-17 17:16:18 +08:00
winlin
3eeeda6a12 Player: Remove jwplayer and osmf 2020-08-17 16:59:25 +08:00
winlin
ecc5f73c54 RTC: Hook beofore publish event 2020-08-17 14:05:01 +08:00
winlin
d5e1116eb7 RTC: Add todo for source cleanup 2020-08-17 11:51:02 +08:00
winlin
9d38009b7f RTC: Ignore twcc if no need to feedback 2020-08-17 11:43:29 +08:00
winlin
1800d9d71b RTC: Support empty RR, ignore it 2020-08-17 11:30:28 +08:00
winlin
fd69635052 RTC: Fix typo 2020-08-17 11:17:58 +08:00
winlin
7069233783 RTC: Refine SDP, parse H264 param 2020-08-13 17:37:04 +08:00
winlin
314e3159f0 RTC: Refine log 2020-08-13 17:23:22 +08:00
winlin
3617acf01c RTC: Refine code 2020-08-13 17:20:03 +08:00
winlin
4c7de039ba RTC: Refine code 2020-08-13 16:27:50 +08:00
winlin
761c880e55 RTC: Refine code 2020-08-13 16:25:56 +08:00
winlin
92b59e308c RTC: Support ARQ for DTLS client 2020-08-13 16:21:01 +08:00
winlin
a5cefbf092 RTC: Cache DTLS packet and fast retransmit it. 2020-08-13 14:41:11 +08:00
winlin
dd9a9b05d1 RTC: Do handshake although ssl done. 2020-08-13 14:22:43 +08:00
winlin
2f50c4eb1a RTC: Refine DTLS 2020-08-13 13:43:23 +08:00
winlin
e7261e1ca6 RTC: Reorder functions 2020-08-13 13:39:43 +08:00
winlin
f79dcc9ae3 RTC: Reorder functions 2020-08-13 13:38:55 +08:00
winlin
ed95124743 RTC: Refine error and log for DTLS 2020-08-13 13:23:45 +08:00
winlin
51bf3707a9 RTC: Refine error and log for DTLS 2020-08-13 12:36:04 +08:00
winlin
6d60e18824 RTC: Refine error and log for DTLS 2020-08-13 12:33:43 +08:00
winlin
9febdaeb48 RTC: Support interval for error pithy print 2020-08-12 17:54:03 +08:00