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

2631 commits

Author SHA1 Message Date
winlin
7136af21de For #1998, TODO: FIME: Should check packetization-mode=1 also. 2020-11-13 08:49:21 +08:00
winlin
5d27c62e95 For #1998, fix fetch remote payload bug. 4.0.56 2020-11-13 08:48:51 +08:00
winlin
4650d47082 For #1998, Support Firefox, use PT in offer. 4.0.55 2020-11-12 18:38:30 +08:00
winlin
57b5204a10 For #1998, Set default fmtp for H264 when transmux RTMP to RTC 2020-11-12 18:36:50 +08:00
winlin
32c1832d64 For #1657, refine code 2020-11-07 07:39:50 +08:00
winlin
385e055c7b For #1657, Fix read bug. 4.0.53 2020-11-06 21:55:17 +08:00
winlin
4618bfc137 For #1657, fix the http read bug 2020-11-06 21:15:19 +08:00
winlin
6dc9824495 For #1657, fix the http read bug 2020-11-06 20:45:44 +08:00
winlin
79655adea0 For #1657, fix the http read bug 2020-11-06 19:53:37 +08:00
winlin
c3f23f4c23 For #1657, fix the http read bug 2020-11-06 19:42:22 +08:00
winlin
a20f02ffe1 For #1657, Read cached data first in SSL. 4.0.48 2020-11-06 19:14:04 +08:00
winlin
30ba5a32ed For #1657, Support HTTPS Streaming 2020-11-06 17:22:23 +08:00
winlin
faf53927e8 For #1657, Fix utest fail 2020-11-06 15:24:37 +08:00
winlin
272ca9d0f6 For #1657, Support HTTPS API 2020-11-06 15:05:01 +08:00
winlin
7916214e27 For #1657, refine api for http 2020-11-06 09:51:04 +08:00
winlin
5782b45978 For #1657: Refine code 2020-11-05 21:44:47 +08:00
winlin
2fedb683e8 For #1657, refine code 2020-11-05 21:25:55 +08:00
winlin
c3d290013e For #1657, handle on_message_done 2020-11-05 18:34:56 +08:00
winlin
4b082ea96c For #1657, refine http api disconnect log 2020-11-05 18:19:43 +08:00
winlin
74799a31e3 For #1657, refine on_http_message with response writer 2020-11-05 18:08:13 +08:00
winlin
d67b050935 For #1657, fix the jsonp bug 2020-11-05 17:57:22 +08:00
winlin
fc21b31714 For #1657, refine the context for disposing 2020-11-05 17:16:59 +08:00
winlin
b492d59df0 For #1657: Refine code 2020-11-05 16:52:33 +08:00
winlin
0a3a38762a For #1657: Remove duplicated code, merge http api with conn 2020-11-05 16:46:16 +08:00
winlin
9cf4203201 For #1657: Refine code 2020-11-05 15:18:13 +08:00
winlin
24125b9770 For #1657: Refine connection arch, remove hierachy 2020-11-05 15:08:36 +08:00
winlin
2a14dc0ebd For #1657: Refine TCP connections arch 2020-11-05 12:25:54 +08:00
winlin
4ba66b388b For #1657: Refine TCP connections arch 2020-11-05 11:47:24 +08:00
winlin
3038dd473d For #1657, refine connection interface 2020-11-04 20:57:07 +08:00
winlin
0a82719bd3 Refine connection structure 2020-11-04 18:15:43 +08:00
winlin
d552a1a5fb For #1657, support HTTPS client, for http-callback. 4.0.45 2020-11-03 15:45:52 +08:00
winlin
a28f98581e Refine cid for source 2020-10-31 22:04:53 +08:00
winlin
365d3b8bda Merge SRS3.0 2020-10-31 21:53:15 +08:00
winlin
9a963c6fd2 Fix #509, Always malloc stack on heap. 3.0.153 2020-10-31 21:27:09 +08:00
winlin
8c1eca98b0 Merge SRS3.0 2020-10-31 19:25:56 +08:00
winlin
b348539687 Remove some global elements for debugging. 3.0.152 2020-10-31 17:53:00 +08:00
winlin
bf5e2add83 Refine source cid, track previous one. 3.0.150 2020-10-31 17:42:20 +08:00
winlin
adadbb7e9c Merge branch '3.0release' into 4.0release 2020-10-24 18:29:12 +08:00
winlin
8445d5543b Refine script and startup logs. 3.0.148 2020-10-24 18:28:53 +08:00
winlin
d5a0ad3dd8 RTC: Use FFmpeg to transcode aac to opus 2020-10-22 17:07:50 +08:00
winlin
97880f6bb7 ST: Allow set the default stack size 2020-10-22 17:06:36 +08:00
winlin
a14f26971b RTC: add comment for DTLS packet 2020-10-19 12:04:28 +08:00
winlin
ba6462aab4 RTC: Refine DTLS ARQ, use step interval 2020-10-03 21:34:34 +08:00
winlin
776f24cf3d Refine resource manager, ignore unsubscribed handler 2020-10-02 09:13:41 +08:00
chenhaibo
ba29095d10 RTC: fix memory leak bug 2020-09-30 11:16:37 +08:00
winlin
42a2dea5e0 Refine code 2020-09-30 11:14:49 +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
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
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
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
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
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
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
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
3363f39eba Fix GB28181 build fail 2020-08-31 13:37:22 +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
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
ef8f3d6189 Refine cid for signal thread 2020-08-30 11:46:50 +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
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
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
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
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
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
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
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
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
winlin
2e56aeba96 RTC: Support interval ratio for pithy print 2020-08-12 17:18:51 +08:00
winlin
9d08318581 RTC: Refine error pithy print log 2020-08-12 17:07:37 +08:00
winlin
ea10d7907f RTC: Refine error pithy print log 2020-08-12 17:01:40 +08:00
winlin
d2da74085c RTC: Refine log 2020-08-12 16:07:43 +08:00
莫战
559e89caf4 ignore padding decode before srtp decryption 2020-08-12 15:18:15 +08:00
winlin
8a98f05066 RTC: Fix H5 bug 2020-08-12 09:03:34 +08:00
winlin
aac2f1debd RTC: Refine code 2020-08-11 17:13:28 +08:00
winlin
e82e28d83e RTC: Refine RTCP dispatch in connection. 2020-08-11 17:01:57 +08:00
winlin
00582e0c36 RTC: Fix RTCP feedback bug 2020-08-11 15:42:08 +08:00
winlin
f702d8bcd7 RTC: Fix RTCP free bug 2020-08-11 15:30:18 +08:00
winlin
6ae414af3f RTC: Refine RTC hijacker. 2020-08-11 14:29:05 +08:00
winlin
a06a750a1b RTC: Support dup DTLS done. Support create publisher/player after DTLS done. 2020-08-11 12:24:01 +08:00
winlin
f54bf8d9be RTC: Support more than one publishers or players. 2020-08-11 11:06:17 +08:00
winlin
571f417db4 RTC: Refine RTCP packets parsing 2020-08-11 09:50:17 +08:00
winlin
a728e02b93 RTC: Refine RTCP packets parsing 2020-08-11 09:40:27 +08:00
winlin
1591318792 Fix build fail 2020-08-10 18:35:32 +08:00
winlin
f3d8973d67 Fix build fail 2020-08-10 15:43:12 +08:00
winlin
f841e0c37a RTC: Refien NACK code 2020-08-10 15:35:17 +08:00
winlin
f066686255 RTC: When track disable, no NACK. 2020-08-10 15:32:47 +08:00
winlin
250a703588 RTC: Use error pithy print for RTP packet error 2020-08-10 15:29:00 +08:00
winlin
cf9a8c7dcb RTC: Show error when send packets. 2020-08-10 15:24:26 +08:00
winlin
6bc316016b RTC: For NACK, it sequence must match exactly, or it cause SRTP fail 2020-08-10 15:06:08 +08:00
winlin
2d4a4b1d2b Fix build fail 2020-08-07 17:37:35 +08:00
winlin
98ccea8cd3 RTC: Refine code 2020-08-07 17:15:36 +08:00
winlin
a1da95c906 RTC: Support server hijacker 2020-08-07 17:04:34 +08:00
winlin
73eb60a9d5 Tenfold: Connection support send rtcp packet 2020-08-07 16:51:48 +08:00
winlin
8c9935db44 RTC: Connection support hijack 2020-08-07 16:41:55 +08:00
winlin
b0590ef4fe RTC: Remove source from conneciton init. 2020-08-07 15:45:18 +08:00
winlin
cf46779ad9 RTC: Show log when track not found 2020-08-07 15:28:17 +08:00
winlin
937167f311 RTC: Support disable DTLS 2020-08-07 14:33:52 +08:00
winlin
d2264ba6f9 RTC: Support semi security transport 2020-08-07 12:50:54 +08:00
winlin
47c43e47b6 RTC: Fix is_started state init bug 2020-08-07 12:48:45 +08:00
winlin
cfb44f0ef8 RTC: Fix warning 2020-08-06 17:59:14 +08:00
winlin
bbd51e3338 RTC: Allow username is optinal 2020-08-06 17:49:51 +08:00
winlin
e2bf5eaf47 RTC: Remove black line 2020-08-06 16:44:36 +08:00