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

5117 commits

Author SHA1 Message Date
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
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
winlin
74a0a2e969 RTC: When parsing header, should ignore padding 2020-08-12 15:18:45 +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
8f1af9a13a RTP: Refine RTCP protocol 2020-08-10 17:48:53 +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
49bb418e74 Fix TWCC default value 2020-08-07 20:11:37 +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
a52a81ebb0 RTC: Fix RTCP extension padding bug 2020-08-06 17:25:20 +08:00
winlin
2f1e77aeaf RTC: Fix RTCP app bug. Add is_rtcp_app API. 2020-08-06 17:18:45 +08:00
winlin
e2bf5eaf47 RTC: Remove black line 2020-08-06 16:44:36 +08:00
winlin
87a4c63130 RTC: Add RTX desc 2020-08-06 16:35:33 +08:00
winlin
9f2aaef283 RTC: Add negotiate play by desc 2020-08-06 16:21:52 +08:00
winlin
ffeb3a8c46 RTC: Refine code 2020-08-06 16:15:06 +08:00
winlin
a98187580f RTC: Refine stat for total pkts. 2020-08-06 14:12:31 +08:00
winlin
b070e5aa05 RTC: Move source to play stream 2020-08-06 13:51:12 +08:00
winlin
994c53b6c1 Merge branch '4.0release' into develop 2020-08-06 12:08:46 +08:00
winlin
4984bcbaef Revert "supprot LAS(live adaptive stream)" 
This reverts commit c1f98ddcc8.
 2020-08-06 12:02:32 +08:00
winlin
9530ea73e3 RTC: Refine error check. 4.0.37 2020-08-06 11:15:28 +08:00
winlin
70d561421c RTC: Check error for send_rtcp_fb_pli 2020-08-05 18:06:54 +08:00
winlin
5c853e02ee RTC: Check error for send_periodic_twcc 2020-08-05 17:46:56 +08:00
winlin
f149c84dd0 RTC: Check error for send_rtcp_rr 2020-08-05 17:24:26 +08:00
winlin
75119a14cf RTC: Check error for send_rtcp_rr 2020-08-05 17:17:33 +08:00
winlin
d156bc2a1b RTC: Refine error, show some bytes for RTCP 2020-08-05 16:47:11 +08:00
winlin
77403dd970 RTC: Refine error log, show some plaintext body bytes. 2020-08-05 16:38:23 +08:00
winlin
77b6151857 RTC: Use srs_string_dumps_hex to dump some bytes when error 2020-08-05 16:23:31 +08:00
winlin
fc10e98f1c RTC: Remove dead code. Fix DTLS empty ctx issue 2020-08-04 20:08:21 +08:00
winlin
d439e36344 RTC: Covert basic packet identify for DTLS/STUN/RTP/RTCP 2020-08-04 17:03:25 +08:00
winlin
49e768ad09 RTC: Fix bug for utest 2020-08-04 16:56:27 +08:00
winlin
103bf86eef RTC: Remove dead code for source 2020-08-04 15:06:51 +08:00
winlin
baceb7f6b0 RTC: Fix the SDP encode issue 2020-08-04 14:07:15 +08:00
winlin
c659098f71 RTC: Set tracks to active for publisher 2020-08-04 13:45:17 +08:00
winlin
dd13889772 BUILD: Compatible with 3.0 options, ignore it 2020-08-03 19:33:34 +08:00
winlin
b847a0a218 BUILD: Compatible with 3.0 options, ignore it 2020-08-03 19:31:14 +08:00
winlin
0905558d49 BUILD: Compatible with 3.0 options, ignore it 2020-08-03 19:28:52 +08:00
winlin
a40abf8df2 RTC: Refine error log 2020-08-03 18:18:15 +08:00
winlin
4aabbd74dc RTC: Cover default status of track 2020-08-03 13:12:39 +08:00
winlin
c72fb76334 RTC: Cover default track status 2020-08-03 13:10:00 +08:00
winlin
0eae1bd493 RTC: Enable track of player when init done. 2020-08-03 12:49:12 +08:00
winlin
8aa20d390e RTC: Disable track by default 2020-08-03 12:36:34 +08:00
winlin
0408040ed7 Fix utest fail for C++11 or C++14 2020-07-30 19:26:28 +08:00
winlin
8e22508057 Refine utest 2020-07-30 18:54:16 +08:00
winlin
2dc311fbd9 Refine code 2020-07-29 22:12:42 +08:00
winlin
3a13d8c380 RTC: Add timer for connection 2020-07-28 17:48:19 +08:00
winlin
d90d42e7bf RTC: Fix warnings 2020-07-28 11:11:16 +08:00
winlin
58702086cc RTC: Refine code 2020-07-27 18:33:49 +08:00
winlin
975c24b24f RTC: Fix warnings 2020-07-27 16:52:44 +08:00
winlin
063c066802 RTC: Refine log 2020-07-27 12:52:46 +08:00
winlin
ca004fe33f RTC: Refine log for error pithy print 2020-07-27 12:44:29 +08:00
winlin
5f7d1e2c5b RTC: Pithy print the address change 2020-07-27 12:28:15 +08:00
winlin
a035d312f9 RTC: Update stat for recv track 2020-07-26 23:28:03 +08:00
winlin
b3212a12de RTC: Update nack stat 2020-07-26 23:18:56 +08:00
winlin
5f7de58095 RTC: Add stat for track. 2020-07-26 22:58:22 +08:00
winlin
133e07e670 RTC: Refine stat code 2020-07-26 21:23:58 +08:00
winlin
0f62587303 Merge branch 'develop' into feature/rtc 2020-07-26 16:42:44 +08:00
winlin
c6a68234cb RTC: Fix publish page 2020-07-26 15:52:36 +08:00
winlin
6545370b7f RTC: Remove dead code. Merge tiny functions. 2020-07-25 09:59:36 +08:00
winlin
21835c38b7 RTC: Support multiple address for client. 4.0.36 2020-07-25 09:33:18 +08:00
winlin
7ec5ef8497 RTC: Fix memory leak for play stream 2020-07-24 18:39:20 +08:00
winlin
069d3ef79d RTC: Suport ULPFEC and RED 2020-07-24 17:01:47 +08:00
winlin
e0c9544995 RTC: Refine code 2020-07-24 16:44:16 +08:00
winlin
bf3b917f1f RTC: Rename SrsRtcOutgoingInfo to SrsRtcPlayStreamStatistic 2020-07-24 10:08:01 +08:00
winlin
0131472ae5 RTC: Rename connection stat 2020-07-24 09:25:30 +08:00
winlin
77256eee08 RTC: Stat summary for connection 2020-07-23 15:14:54 +08:00
winlin
be951b17f1 RTC: Refine code 2020-07-22 18:20:21 +08:00
winlin
c115f77038 RTC: Use error pithy print to reduce dup logs 2020-07-22 15:51:48 +08:00
winlin
c2c35a7330 Refine code 2020-07-22 14:27:03 +08:00
winlin
03105c96c2 RTC: Use isolate cid for UDP mux listener 2020-07-22 12:00:23 +08:00
winlin
d2984ea49c RTC: Refine cid for session 2020-07-21 12:03:18 +08:00
winlin
c9c34b54a7 RTC: Refine cid for session 2020-07-21 11:56:46 +08:00
winlin
3a3d908a63 RTC: Refine twcc to connection 2020-07-21 11:38:41 +08:00