external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 15:04:20 +00:00
Code Issues Releases Wiki Activity
8328 commits 14 branches 107 tags 377 MiB
Commit graph

6489 commits

Author SHA1 Message Date
xialixin@kanzhun.com
fdaee20b81 For #2200, Enable RTC and FLV for GB28181 2021-02-19 18:54:12 +08:00
winlin
548fcd627b Config: Update config files, daemon off, log to console 2021-02-19 18:54:00 +08:00
winlin
61eeb781b7 Always link with pthread 2021-02-19 18:53:48 +08:00
winlin
1f621a6db3 Remove dead code: memory watch 2021-02-19 18:53:40 +08:00
winlin
c6cb0fb21f Refine scripts 2021-02-19 18:53:37 +08:00
winlin
0fe031a156 Support to disable stats by default 2021-02-19 18:53:34 +08:00
winlin
7d75f0af0f Remove dead code 2021-02-19 18:53:27 +08:00
winlin
044df17791 Fix utest fail 2021-02-19 18:53:23 +08:00
winlin
c5d2027f9a RTC: Support high performance timer about 25ms resolution. 4.0.72 2021-02-19 18:53:21 +08:00
winlin
ebcba149ae For #2194, yield for timer, for rtc player 2021-02-19 18:53:18 +08:00
winlin
df1eca10fb For #2194, yield for timer, for rtc publisher 2021-02-19 18:53:16 +08:00
winlin
a049ce3fb7 For #2194, Core: Refine yield for high performance timer. 2021-02-19 18:53:14 +08:00
winlin
a5a96491a3 For #2194, yield for timer, for live publisher 2021-02-19 18:53:13 +08:00
winlin
d1bcc03d9a For #2194, yield for high performance timer, for live player 2021-02-19 18:53:10 +08:00
winlin
c0fda42743 For #2194, Support ST yield 2021-02-19 18:53:08 +08:00
winlin
b4b9776b02 Core: Support yield current coroutine for high performance timer. 2021-02-19 18:53:03 +08:00
winlin
d8563398b2 Clock: Update stat. Insert timer to execute first 2021-02-19 18:53:02 +08:00
winlin
f987198af0 Clock: Use one system wall clock 2021-02-19 18:52:58 +08:00
winlin
9db7126eb4 Core: Refine ST stat for thread switch 2021-02-19 18:52:56 +08:00
winlin
15f7fa2c36 Core: Refine ST stat for io events 2021-02-19 18:52:54 +08:00
winlin
12d7e57011 Core: Refine sched and clock stat 2021-02-19 18:52:53 +08:00
winlin
c2332f9e55 Core: Use 20ms wall clock 2021-02-19 18:52:49 +08:00
winlin
bddc787a16 Refine the pps. 2021-02-19 18:52:35 +08:00
winlin
70fb647ac9 Perf: Add stat for sched of ST. 2021-02-19 18:52:27 +08:00
winlin
e91e0eaf46 Perf: Add stat for io of ST. 2021-02-19 18:52:12 +08:00
winlin
181c9f25ed Live: Support connect origin by HTTP-FLV/HTTPS-FLV 2021-02-19 18:16:05 +08:00
winlin
37679f2acc Fix utest fail 2021-02-19 11:18:42 +08:00
xialixin@kanzhun.com
4df6fa540f For #2200, Enable RTC and FLV for GB28181 2021-02-18 21:51:49 +08:00
winlin
adb6f723c7 Config: Update config files, daemon off, log to console 2021-02-18 11:39:25 +08:00
winlin
57919e4351 Refine code, move SRS adapter. 2021-02-15 20:01:49 +08:00
winlin
d8e27c3845 Always link with pthread 2021-02-15 19:47:02 +08:00
winlin
4ef1acb700 Remove dead code: memory watch 2021-02-15 19:33:40 +08:00
winlin
0898a1a7ea Refine scripts 2021-02-15 19:24:23 +08:00
winlin
25be6d6bc0 Support to disable stats by default 2021-02-15 13:09:13 +08:00
winlin
f17fa69deb Remove dead code 2021-02-15 12:43:41 +08:00
winlin
3147c8f9bc Fix utest fail 2021-02-15 12:37:16 +08:00
winlin
b1e7e19fd1 RTC: Support high performance timer about 25ms resolution. 4.0.72 2021-02-12 09:31:18 +08:00
winlin
ccb79bc7eb For #2194, yield for timer, for rtc player 2021-02-11 23:10:08 +08:00
winlin
5a28e658a4 For #2194, yield for timer, for rtc publisher 2021-02-11 22:49:54 +08:00
winlin
a04dd7ed30 For #2194, Core: Refine yield for high performance timer. 2021-02-11 22:49:08 +08:00
winlin
4fc1a19415 For #2194, yield for timer, for live publisher 2021-02-11 22:03:00 +08:00
winlin
211b05fc64 For #2194, yield for high performance timer, for live player 2021-02-11 21:15:26 +08:00
winlin
76d6449317 For #2194, Support ST yield 2021-02-11 21:14:45 +08:00
winlin
79f9cd6b3a Core: Support yield current coroutine for high performance timer. 2021-02-11 21:04:09 +08:00
winlin
321f555e30 Clock: Update stat. Insert timer to execute first 2021-02-11 17:34:03 +08:00
winlin
fb61a6979c Clock: Use one system wall clock 2021-02-11 13:39:43 +08:00
winlin
71cc8e35d9 Core: Refine ST stat for thread switch 2021-02-11 13:26:20 +08:00
winlin
e726aba8f9 Core: Refine ST stat for io events 2021-02-11 12:07:38 +08:00
winlin
cde456710d Core: Refine sched and clock stat 2021-02-11 09:39:09 +08:00
winlin
ff388b2f38 Core: Use 20ms wall clock 2021-02-11 09:15:05 +08:00
winlin
99b4866717 Refine the pps. 2021-02-10 21:20:49 +08:00
winlin
a46debb4bb Perf: Add stat for sched of ST. 2021-02-10 20:00:33 +08:00
winlin
7b913b1115 Perf: Add stat for io of ST. 2021-02-10 18:20:11 +08:00
winlin
7a96b28735 Merge 4.0release 2021-02-10 16:32:30 +08:00
winlin
b431ad738c RTC: Refine performance about 700+ streams. 4.0.71 2021-02-10 16:28:11 +08:00
winlin
b7c7d6566f Fix build fail 2021-02-10 16:27:09 +08:00
winlin
2aa94c643c Refine server stat, extract to hybrid server stat 2021-02-10 16:19:51 +08:00
winlin
6b260d6021 Fix utest fail 2021-02-10 16:17:01 +08:00
winlin
7114682eec Timer: Apply timer(HourGlass) to server and sources 2021-02-10 16:16:58 +08:00
winlin
77cffd3e04 Main: Refine sever manager. 2021-02-10 16:16:56 +08:00
winlin
f9bd84109b Timer: Refine the hour glass, support stop 2021-02-10 16:16:52 +08:00
winlin
4a37fe30c7 RTC: Refine RTP header, never extends from any class 2021-02-10 16:16:49 +08:00
winlin
6feaeace27 RTC: Send NACK by timer, no by RTP packet 2021-02-10 16:16:42 +08:00
winlin
d2e728812b RTC: Send NACK by timer, no by RTP packet 2021-02-10 16:14:58 +08:00
winlin
5919865e5d RTC: Refine NACK check, interval, time 2021-02-10 16:14:54 +08:00
winlin
627688c582 RTC: Update stat for received nack 2021-02-10 16:14:47 +08:00
winlin
44c85cc3d2 RTC: Never copy the packet for hijack. 2021-02-10 16:13:25 +08:00
winlin
81db13f27f RTC: Update stat for nack 2021-02-10 16:13:18 +08:00
winlin
51e630d53c RTC: For RTP packet, never switch to context of session except error. 2021-02-10 16:11:07 +08:00
winlin
154ae9b4eb RTC: Update stat for twcc and rr 2021-02-10 16:10:42 +08:00
winlin
86d615f27e RTC: Print stat for pli and timer every 5s. 4.0.70 2021-02-10 16:08:04 +08:00
winlin
9a0e5bc979 RTC: Fix udp recvfrom bug 2021-02-10 16:07:42 +08:00
winlin
ccb6c49029 RTC: Refine timer to 20ms, twcc to 40ms 2021-02-10 15:58:11 +08:00
winlin
d069346f6b Update server stat for fast-id search 2021-02-10 15:58:08 +08:00
winlin
84afeaf433 Update server stat for fast-id search 2021-02-10 15:58:05 +08:00
winlin
44f5ca6a35 Update server stat for fast-id search 2021-02-10 15:58:03 +08:00
winlin
5ae47725e6 SRS: Refine the UDP address parsing, no string 2021-02-10 15:58:01 +08:00
winlin
ca3ac467a3 RTC: Stat the UDP packets and addresses 2021-02-10 15:57:58 +08:00
winlin
2b73c1c7e6 RTC: Refine the UDP address parsing, no string 2021-02-10 15:57:57 +08:00
winlin
52609ea2f0 RTC: Use vector for fast search fast-id 2021-02-10 15:57:55 +08:00
winlin
7f4d8a40e9 RTC: Refine the SRTP protect api 2021-02-10 15:57:52 +08:00
winlin
2989e6c9c3 Fix build fail 2021-02-10 15:57:49 +08:00
winlin
949044d773 RTC: Refine SRTP unprotect rtp and rtcp, without copy 2021-02-10 15:57:44 +08:00
winlin
aec27450e8 RTC: Refine unprotect_rtp to reuse cipher 2021-02-10 15:57:41 +08:00
winlin
719df6fa41 RTC: Parse TWCC SN fastly. 2021-02-10 15:57:38 +08:00
winlin
79a6907a65 RTC: Parse PT fast and refine udp handler. 4.0.69 2021-02-10 15:57:37 +08:00
winlin
826546d518 Refine pps add SrsPps 2021-02-10 15:57:29 +08:00
winlin
c3414a30dc RTC: Refine UDP packet peer fast id. 4.0.68 2021-02-10 15:57:25 +08:00
winlin
e95fd10462 RTC: Don't parse RTP header if no twcc 2021-02-10 15:57:23 +08:00
winlin
49a772770f Refine code 2021-02-10 15:57:21 +08:00
winlin
fec088972d RTC: Fix bug for header parsing 2021-02-10 15:57:17 +08:00
winlin
e17d20c8fa RTC: Refine static cast for RTC connection 2021-02-10 15:57:16 +08:00
winlin
a5b21c159f RTC: Support disable nack 2021-02-10 15:57:13 +08:00
winlin
2b60112130 RTC: Support disable nack 2021-02-10 15:57:12 +08:00
winlin
dffbebfe6f RTC: Fast parse ssrc and find the publisher 2021-02-10 15:57:03 +08:00
winlin
5f31868ce6 RTC: Refine publish stream by find publisher 2021-02-10 15:57:00 +08:00
winlin
6fa3b8212c Update ST doc 2021-02-10 15:56:43 +08:00
winlin
301904467a Update .gitignore 2021-02-10 15:56:34 +08:00
winlin
b0208029bb RTC: Reuse UDP socket to receive packet. 4.0.67 2021-02-10 15:55:35 +08:00
winlin
9ada516e98 At least wait 1ms when <1ms, to avoid epoll_wait spin loop. 4.0.66 2021-02-10 15:55:01 +08:00
winlin
5eafcea895 RTC: Refine performance for UDP recv context id switch 2021-02-10 15:48:20 +08:00
winlin
b7f5fa7c9d RTC: Fix NACK remove loop bug 2021-02-10 15:48:15 +08:00
winlin
4bcfce7ff1 RTC: Refine is_alive code 2021-02-10 15:48:12 +08:00
winlin
aeca278de0 RTC: Refine log for twcc large timer 2021-02-10 15:47:54 +08:00
winlin
e776e0eca7 Refine server stat, extract to hybrid server stat 2021-02-10 13:07:26 +08:00
winlin
152c161de3 Fix utest fail 2021-02-09 21:56:30 +08:00
winlin
a357c013cd Timer: Apply timer(HourGlass) to server and sources 2021-02-09 17:15:25 +08:00
winlin
ee1d06c613 Main: Refine sever manager. 2021-02-09 12:44:56 +08:00
winlin
98c29a1494 Timer: Refine the hour glass, support stop 2021-02-09 11:54:08 +08:00
winlin
45834b805b RTC: Refine RTP header, never extends from any class 2021-02-09 10:53:44 +08:00
winlin
b189fc3fac RTC: Send NACK by timer, no by RTP packet 2021-02-08 18:28:32 +08:00
winlin
407ae1d7f6 RTC: Send NACK by timer, no by RTP packet 2021-02-08 17:19:20 +08:00
winlin
abc26d470b RTC: Refine NACK check, interval, time 2021-02-08 16:24:12 +08:00
winlin
d505bb6ea6 RTC: Update stat for received nack 2021-02-08 16:23:13 +08:00
winlin
43d4240a30 RTC: Never copy the packet for hijack. 2021-02-08 15:32:56 +08:00
winlin
d01a429c13 RTC: Update stat for nack 2021-02-08 14:14:27 +08:00
winlin
e31169d306 RTC: For RTP packet, never switch to context of session except error. 2021-02-08 13:17:22 +08:00
winlin
515529eba9 RTC: Update stat for twcc and rr 2021-02-08 13:16:07 +08:00
winlin
4539ffa086 RTC: Print stat for pli and timer every 5s. 4.0.70 2021-02-08 11:51:48 +08:00
winlin
18c27111e0 RTC: update stat for pli, timer and dispose 2021-02-08 11:45:34 +08:00
winlin
aefd7fccd0 RTC: Fix udp recvfrom bug 2021-02-08 08:25:35 +08:00
winlin
3d34eb33e5 Fix utest fail 2021-02-07 22:11:35 +08:00
winlin
b4282a6ee1 Fix build fail 2021-02-07 21:39:09 +08:00
winlin
a43f339aa6 Update server stat for cid 2021-02-07 21:33:24 +08:00
winlin
102434b3d5 Context: Use key of thread to store context 2021-02-07 21:31:39 +08:00
winlin
33ab785ce9 RTC: Refine timer to 20ms, twcc to 40ms 2021-02-07 21:08:42 +08:00
winlin
83ab551396 Update server stat for fast-id search 2021-02-07 20:58:24 +08:00
winlin
cbfec753f0 Update server stat for fast-id search 2021-02-07 20:57:22 +08:00
winlin
af499094f8 Update server stat for fast-id search 2021-02-07 20:54:06 +08:00
winlin
ec0d68d6b0 SRS: Refine the UDP address parsing, no string 2021-02-07 20:27:40 +08:00
winlin
638a94ade2 RTC: Stat the UDP packets and addresses 2021-02-07 20:12:54 +08:00
winlin
d41a925694 RTC: Refine the UDP address parsing, no string 2021-02-07 20:05:36 +08:00
winlin
95193979f4 RTC: Use vector for fast search fast-id 2021-02-07 19:31:46 +08:00
winlin
ef279a8b1e RTC: Refine the SRTP protect api 2021-02-07 16:57:48 +08:00
winlin
864356c9bd Fix build fail 2021-02-07 16:32:34 +08:00
winlin
9f91351f3c RTC: Refine SRTP unprotect rtp and rtcp, without copy 2021-02-07 16:21:25 +08:00
winlin
0c07459d19 RTC: Refine unprotect_rtp to reuse cipher 2021-02-07 16:04:19 +08:00
winlin
9a9efb8546 RTC: Parse TWCC SN fastly. 2021-02-07 15:48:46 +08:00
winlin
d184b5662c RTC: Parse PT fast and refine udp handler. 4.0.69 2021-02-07 12:44:00 +08:00
winlin
668f8cbf6c Refine pps add SrsPps 2021-02-06 18:05:04 +08:00
winlin
8cb5cab717 RTC: Refine UDP packet peer fast id. 4.0.68 2021-02-05 18:04:29 +08:00
winlin
7bb04998af RTC: Don't parse RTP header if no twcc 2021-02-05 17:15:19 +08:00
winlin
05441d6354 Refine code 2021-02-05 17:10:42 +08:00
winlin
fd605fc4ac RTC: Fix bug for header parsing 2021-02-05 17:05:46 +08:00
winlin
9c17721eb9 RTC: Refine static cast for RTC connection 2021-02-05 17:02:08 +08:00
winlin
d526e170a5 RTC: Support disable nack 2021-02-05 15:58:54 +08:00
winlin
d0c0f26160 RTC: Support disable nack 2021-02-05 15:52:44 +08:00
winlin
80985c7307 RTC: Fast parse ssrc and find the publisher 2021-02-05 14:13:48 +08:00
winlin
cd06f2da0c RTC: Refine publish stream by find publisher 2021-02-05 14:07:24 +08:00
winlin
f3806126c4 Research: Add udp connect 2021-02-05 11:07:53 +08:00
winlin
de3ec74657 Update ST doc 2021-02-05 10:20:23 +08:00
winlin
960f48721f Update .gitignore 2021-02-05 09:55:21 +08:00
winlin
2b85ad1f60 RTC: Reuse UDP socket to receive packet. 4.0.67 2021-02-04 17:27:32 +08:00
winlin
cfddc8f266 At least wait 1ms when <1ms, to avoid epoll_wait spin loop. 4.0.66 2021-02-04 16:51:47 +08:00
winlin
19a7c7682e RTC: Refine performance for UDP recv context id switch 2021-02-04 15:48:58 +08:00
winlin
ec01f94b17 RTC: Fix NACK remove loop bug 2021-02-03 19:08:33 +08:00
winlin
0c89e899bd RTC: Refine is_alive code 2021-02-03 18:58:07 +08:00
winlin
1db8a3c92e RTC: Refine log for twcc large timer 2021-02-02 18:05:23 +08:00
winlin
076182cde2 Pick from develop. 4.0.65 2021-01-31 18:08:50 +08:00
winlin
d92bbe7558 RTC: Support eip with port 2021-01-31 18:07:43 +08:00
winlin
3fa767f3cc Build: Support --ssl-local to rebuild openssl even system exists 2021-01-31 18:07:39 +08:00
winlin
cd83054759 ST: Update doc 2021-01-31 18:07:36 +08:00
winlin
09224ea7e0 ST: Update doc 2021-01-31 18:07:31 +08:00
winlin
6e3bd61599 Enable --nasm and --srtp-asm by default for performance. 4.0.64 2021-01-31 18:07:20 +08:00
winlin
945cf64024 Refine srs_player 2021-01-31 18:06:55 +08:00
winlin
f006bf59b1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:52 +08:00
winlin
979bf86e8b Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:49 +08:00
winlin
5c41766b79 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:46 +08:00
winlin
b373400257 RTC: Extract NACK handler from stream to track. 2021-01-31 18:06:40 +08:00
winlin
40ea0b67f9 RTC: Refine RTP packet decoder to track and stream 2021-01-31 18:05:51 +08:00
winlin
0fe85a295c Refine options with default value 2021-01-31 18:05:26 +08:00
winlin
b9a5d4beb6 Refine options with default value 2021-01-31 18:05:07 +08:00
winlin
1615c3df6c RTC: Refine code 2021-01-31 17:59:59 +08:00
winlin
ec2535b183 RTC: Refine code 2021-01-31 17:59:46 +08:00
winlin
62909bb2d0 Merge branch '4.0release' into develop 2021-01-31 17:56:58 +08:00
winlin
0848574902 Research: Add c++11 thread-local 2021-01-31 17:27:47 +08:00
winlin
73c4b1cb6e RTC: Enable -std=c++11 by default. 4.0.65 2021-01-31 14:54:51 +08:00
winlin
e5391ff93d RTC: Support eip with port 2021-01-30 21:36:17 +08:00
winlin
849703bca1 Build: Support --ssl-local to rebuild openssl even system exists 2021-01-26 17:54:44 +08:00
winlin
5678e8e1e7 ST: Update doc 2021-01-26 09:03:39 +08:00
winlin
6ecda1c79e ST: Update doc 2021-01-26 08:58:22 +08:00
winlin
f6720c18c6 Enable --nasm and --srtp-asm by default for performance. 4.0.64 2021-01-25 22:23:42 +08:00
winlin
10205e8cc1 Refine srs_player 2021-01-20 21:06:57 +08:00
winlin
4514947e67 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-20 20:47:57 +08:00
winlin
f01da568cb Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-20 20:36:30 +08:00
winlin
618333cdd1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-20 18:59:14 +08:00
winlin
e2bdacb337 RTC: Extract NACK handler from stream to track. 2021-01-19 17:05:40 +08:00
winlin
f2d45442c1 RTC: Refine RTP packet decoder to track and stream 2021-01-19 15:56:42 +08:00
winlin
0c56d11605 Refine options with default value 2021-01-18 17:32:14 +08:00
winlin
1371a47962 Refine options with default value 2021-01-18 17:28:51 +08:00
winlin
e26b685169 Refine script 2021-01-18 12:34:11 +08:00
winlin
09011eea3a RTC: Refine code 2021-01-17 20:30:10 +08:00
winlin
aaa3918a72 RTC: Refine code 2021-01-16 09:52:36 +08:00
winlin
4bb3ad5637 For #2142, Fix bug for fixing memory leak for bridger. 4.0.62 2021-01-15 16:58:23 +08:00
winlin
4e70bf5eaf For #2142, Fix memory leak for bridger of RTC source stream. 4.0.61 2021-01-15 14:16:32 +08:00
winlin
50bb9eb391 Revert "For #2142, RTC: Fix memory leak" 
This reverts commit 2492b726af.
 2021-01-15 13:31:58 +08:00
winlin
ed32965aa4 Revert "Fix #2142, Async release bridger when unpublish. 4.0.60" 
This reverts commit 06adb9dc42.
 2021-01-15 13:30:52 +08:00
winlin
06adb9dc42 Fix #2142, Async release bridger when unpublish. 4.0.60 2021-01-14 19:12:01 +08:00
winlin
10ffb2da36 HTML5 video tag resolution adaptive. 4.0.59 2021-01-08 14:16:20 +08:00
winlin
26dec1b037 Release 4.0.58 
Merge #2109, Fix bugs for GB28181.
Merge #2109, Refine srs_string_split.
Fix memory leak and bugs for RTC.
 2021-01-08 14:16:11 +08:00
winlin
b6843428c6 Fix build warnings 2021-01-08 14:09:28 +08:00
winlin
81d78310a0 Fix build warnings 2021-01-08 13:29:32 +08:00
winlin
61f62ceec6 Fix build warnings 2021-01-08 11:48:56 +08:00
winlin
473942c6f6 Kernel: Add utest for srs_string_split 2021-01-08 10:27:12 +08:00
winlin
8580b1e5fb Merge branch '4.0release' into develop 2021-01-07 18:02:42 +08:00
winlin
f8266fe3b7 Add usage for --cherrypy=on|off when configure 2021-01-07 18:02:24 +08:00
winlin
bfa156247c Merge branch '4.0release' into develop 2021-01-07 17:47:54 +08:00
winlin
6c7ffdeedf Merge branch '3.0release' into 4.0release 2021-01-07 17:27:33 +08:00
winlin
d520679547 Refine code for changing id of stat to string 2021-01-07 17:27:30 +08:00
winlin
4f013404e3 Refine stat id 2021-01-07 17:09:33 +08:00
winlin
1c41f5d796 Merge SRS3, change id of stat to string 2021-01-07 17:04:11 +08:00
winlin
fb7c051833 Change id from int to string for the statistics. 3.0.157 2021-01-07 16:47:49 +08:00
johzzy
3c14a96bdd
fix: html5 video tag resolution adaptive. (#2128) 2021-01-07 13:47:30 +08:00
winlin
248085edfe For #2109, Add more utest for srs_string_split 2021-01-07 12:30:51 +08:00
winlin
2492b726af RTC: Fix memory leak 2021-01-07 11:45:03 +08:00
xbpeng121
47422b7819
GB28181: 无法对接平台问题及一些小bug (#2109) 
* 1-新增srs_string_split2函数，该函数支持空串也能按照原有顺序进行切分并放入数组
2-SrsGb28181Device增加属性字段，并在收到catalog命令时能够更新该属性
3-修复sip包解包不严谨bug(body中有可能会有SRS_RTSP_CRLFCRLF那么导致header_body[1]就不一定是body了可能只是body的一部分)

* 1-修复停用rtp多路复用参数（invite_port_fixed）不起作用bug

* bugfix: 当srs发送invite时会指定一个ssrc作为流媒体序列号，但有些平台发流时并不使用这个作为ssrc,而是自己新生成一个。（修复该bug是在invite response时解析内容中的sdp，把对方生成的流媒体序列号ssrc读出来，并且更新srs的channel映射）

* Update push.gb28181.conf

恢复成原来的conf

* bugfix,在取得muxer时需要更新。之前写反了

* Merge branch 'develop' into 4.0release

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 修改sdp_map相同属性的连接符

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 修改sdp_map相同属性的连接符

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 回退原来代码

* 删除parse_sdp存储至map相关代码

* 格式恢复

* 格式恢复

* 恢复格式

* srs_string_split() 函数的bugfix

Co-authored-by: xbpeng <xianbin.peng@sibat.cn>
 2021-01-06 15:37:02 +08:00
winlin
6cf93557e1 RTC: Fix publish RTC ssrc bug 2021-01-06 12:15:04 +08:00
winlin
fbbdf5ba0e RTC: Fix audio track NULL bug 2021-01-05 18:38:11 +08:00
winlin
040893efde Add research for UDP binding 2021-01-05 18:30:39 +08:00
winlin
155587d2c1 RTC: Fix parse error stap playload crash bug 2021-01-05 10:56:05 +08:00
winlin
ebe38f7337 RTC: Fix RTX bug 2021-01-03 20:01:53 +08:00
winlin
78fcaaf7b1 RTC: Fix memory leak 2020-12-30 16:03:28 +08:00
winlin
03389f5e8c Merge branch '4.0release' into develop 2020-12-27 12:56:45 +08:00
winlin
1df2ea5ca8 Merge branch '3.0release' into 4.0release 2020-12-27 12:56:28 +08:00
winlin
831c78062b Remove vhost in query if not present it 2020-12-27 12:55:27 +08:00
winlin
8fa093c53c Merge branch '4.0release' into develop 2020-12-26 22:18:45 +08:00
winlin
2538b02a9b Merge branch '3.0release' into 4.0release 2020-12-26 22:15:37 +08:00
winlin
6e43ef6866 For RTMP edge/forward, pass vhost in tcUrl, not in stream. 3.0.156 2020-12-26 22:11:23 +08:00
winlin
f9444c376c Merge SRS4 2020-12-24 18:51:04 +08:00
winlin
0ccbd7c40a Support get schema for HTTP message 2020-12-24 18:49:56 +08:00
winlin
af8bf67606 Refine player 2020-12-24 17:19:33 +08:00
winlin
92588c0872 Merge branch '4.0release' into develop 2020-12-24 11:34:17 +08:00
winlin
18d049accc Support disable CherryPy. 4.0.57 2020-12-24 11:33:49 +08:00
jinxue.cgh
7f081b4178 RTC: Refine TWCC from 200ms to 50ms 2020-12-23 15:13:21 +08:00
winlin
c3938ddfd2 Research: Add cost analysis 2020-12-22 19:24:35 +08:00
winlin
a4d1b3e2ca Research: Add cost analysis 2020-12-22 17:36:18 +08:00
winlin
ec212b7413 Merge branch '4.0release' into develop 2020-12-21 12:06:25 +08:00
winlin
764909c6cf Clear disposing then free resources to avoid reuse addresses 2020-12-21 12:05:56 +08:00
winlin
6afdf3addf Merge branch '4.0release' into develop 2020-12-21 12:00:03 +08:00
winlin
e8fa92e3d1 Refine logs for resource manager 2020-12-21 11:59:35 +08:00
winlin
5949eee4f4 Keep resources when dispoing to avoid reuse addresses. 2020-12-21 11:56:22 +08:00
winlin
9217fad73b Hotfix: Print resource address when manager dispose it 2020-12-21 11:28:58 +08:00
winlin
4d18835f3c Fix build fail 2020-12-21 10:37:33 +08:00
winlin
90b61ad952 Merge SRS4 2020-12-18 10:14:26 +08:00
winlin
5ebf034aea For #1694, Refine API for nb_bytes 2020-12-18 09:56:40 +08:00
winlin
c17474627b Merge SRS3 2020-12-18 09:34:32 +08:00
winlin
25c76c1e8a Fix #1694, Support DVR 2GB+ MP4 file. 3.0.155 2020-12-17 18:43:45 +08:00
winlin
576be75f00 Merge branch '4.0release' into develop 2020-12-17 12:28:04 +08:00
winlin
c97e943b07 Merge SRS3 2020-12-17 12:27:47 +08:00
winlin
ab5ddd24e2 Fix #1548, Add edts in MP4 for Windows10. 3.0.154 2020-12-17 12:07:34 +08:00
winlin
721173e6af MP4: Fix warnings 2020-12-17 11:25:51 +08:00
winlin
1502560bcf Update conf 2020-12-13 13:29:30 +08:00
winlin
9caeb606bf ST: Support show coroutines. 2020-12-10 11:36:24 +08:00
winlin
c7c6d8778a RTC: Fix warnings 2020-12-08 16:59:43 +08:00
jinxue.cgh
5309dbe18b RTC: Refine RTCP process 2020-12-07 21:40:51 +08:00
winlin
18ae8d8571 RTC: Fix SDP bug for firefox 2020-12-03 10:58:46 +08:00
winlin
aad7c448bf For #1998, Support Firefox. 2020-12-02 18:23:57 +08:00
winlin
0c113ff084 For #1998, support firefox 2020-12-02 17:29:05 +08:00
winlin
c5457e8241 RTC: Support unified-plan 2020-12-02 12:54:29 +08:00
winlin
27db60cc23 Fix #1996, Heap off-by-one in utest 2020-12-01 19:49:15 +08:00
winlin
c796c0d093 Fix #1689, fix typo 2020-12-01 17:05:47 +08:00
莫战
b38f30c3ee support query parsing and escape 2020-12-01 16:27:37 +08:00
莫战
dc7124cd05 support base64 encode 2020-12-01 16:04:55 +08:00
jinxue.cgh
58b75c6f1b tfsfu: add play red pt negotiate 2020-12-01 13:37:42 +08:00
winlin
140f8b0fce For #1998, refine PT for firefox, support RED 2020-12-01 13:25:53 +08:00
PieerePi
3d5c18c25a
GB28181 code crashed in ffmpeg after commit "RTC: Use FFmpeg to transcode aac to opus" <d5a0ad3dd8>. (#2057) 
Change the size from 64K to 256K.
 2020-11-30 11:02:30 +08:00
ghostsf
d3e153e504
fix: update CMakeLists.txt for rtc (#2042) 2020-11-25 11:22:32 +08:00
Jesse Xi
8515f5a91e
incomplete_len 在大华摄像头下，因为大华包头对音频的不标准处理，可能为负值，而sizeof(SrsPsPacketStartCode) 返回的是unsigned 类型， 因些增加判断 (#2039) 
Co-authored-by: jesse.xi <jj.xi@tianrang-inc.com>
 2020-11-17 16:44:37 +08:00
winlin
c779d95246 GB28181: Remove chinese comments. 2020-11-16 00:06:03 +08:00
winlin
977e027d86 SIP: Fix build fail for Mac 2020-11-15 23:47:00 +08:00
Pieere Pi
ffae1720ec gb28181模块可用性增强 
主要改动，
1. 支持作为GB/T 28181上级平台
2. 新的目录接口sip_query_devicelist (/api/v1/gb28181?action=sip_query_devicelist)
3. 各种异常和问题修复
4. 其他一些小改动

以上改动基于feature/rtc分支，因为需要网页用WebRTC来拉GB28181的监控流，gb28181分支代码有点老了。

下面的序号n是指第n个差异块（"@@ -"之间的内容）。

srs_gb28181.html
1. 原页面上多加了一个端口号
2-4. 给摄像头加上名称显示
5. 查询目录去掉chid
6. 删除通道参数分解为id和chid
7. API端口固定为1985

srs_app_gb28181.cpp
1-4. 四处因为错误而退出GB28181媒体处理循环，修改为不退出
5. payload为空异常
6. 修正判断startcode越界一个字符导致内存写越界的问题
ps流有可能末尾是全零填充，而且越界的那个字符正好是0x01，这样会多出一个nalu（末尾的三个0x00和一个越界的0x01），后面写video_data内存越界（if (first_pos != pre_pos){块，此处size - pre_pos - 4为-1，uint32_t naluLen得到的值为0，video_data[pre_pos+3] = p[0];写越界）破坏了其他数据，后续video_stream析构出错程序异常退出。
7. 此处srs后来已修复
8. 更新ssrc为被叫返回的值
原代码只支持标准中的《点播域内设备媒体流SSRC处理方式》（设备注册上来），不支持《点播外域设备媒体流SSRC处理方式》（即作为上级平台）。
这是因为如果srs作为上级平台，ssrc不是自己生成的，而是下级平台生成的。
9. 删除通道参数分解为id和chid
10. notify_sip_unregister后delete_stream_channel无效
11. notify_sip_query_catalog清空内存中的设备列表
12. 新函数query_device_list

srs_app_gb28181.hpp
1. update_rtmpmuxer_to_newssrc_by_id声明
2. 新函数get_gb28181_config_ptr和函数delete_stream_channel声明修改
3. 新函数query_device_list

srs_app_gb28181_sip.cpp
1-4. 在调试界面给摄像头加上名称显示；新函数clear_device_list和新函数dumpItemList
5-6. 两处因为错误而退出GB28181信令处理循环，修改为不退出
7. 设备注册上来，不检查服务器ID匹不匹配（支持作为上级平台）
8. 收到一个目录上报消息，更新内存中的数据
9. 更新ssrc为被叫返回的值
10. 新函数query_device_list

srs_app_gb28181_sip.hpp
1. 在调试界面给摄像头加上名称显示
2. 每个设备加上item_list，用于存储目录；新函数clear_device_list和新函数dumpItemList
3. 新函数clear_device_list

srs_app_http_api.cpp
1. 删除通道参数分解为id和chid
2. 新的接口sip_query_devicelist，用于查询所有设备的目录

srs_sip_stack.cpp
1. GB2312转UTF-8类
2. 被叫返回的ssrc初始化
3. parse_xml声明修改
4. 对XML内容进行字符集检测和转换
5-7. parse_xml定义修改
8. SIP BODY里面也有可能有\r\n
9-10. 防止恶意SIP消息 by vicious sip prober
11-12. 新的XML解析目录代码
13. 获取被叫返回的ssrc

srs_sip_stack.hpp
1. 依赖vector
2. 每个设备加上item_list，用于存储目录
3. 被叫返回的ssrc
4. parse_xml声明修改
 2020-11-15 23:14:34 +08:00
yinjiaoyuan
fe65c7bf84 For 2034, GB28181: Support transport over TCP 2020-11-15 22:50:59 +08:00
winlin
751dab56d8 RTC: Refine player and publisher 2020-11-15 16:48:30 +08:00
winlin
529264f238 RTC: Refine player and publisher 2020-11-15 15:46:24 +08:00
winlin
3cf3047f97 Add conf/rtc_live.conf 2020-11-14 18:56:49 +08:00
winlin
7521bc86ad For #1998, Update conf 2020-11-13 09:28:24 +08:00
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
9908433bc8 For #1508, Transform http header name to upper camel case. 4.0.54 2020-11-11 16:38:05 +08:00
winlin
07c04a042a URI: Refine uri parser 2020-11-10 18:51:21 +08:00
winlin
efca38cd89 Player: Change default HTTP-API port to 1985 for WebRTC 2020-11-10 18:07:15 +08:00
winlin
e085250245 Update players 2020-11-07 11:12:22 +08:00
winlin
32c1832d64 For #1657, refine code 2020-11-07 07:39:50 +08:00
winlin
5709ee1b63 For #1657, add https configs 2020-11-07 07:11:57 +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
a49b2d7b0e For #1657, Support HTTPS Callback, HTTPS API, HTTPS FLV, etc. 4.0.47 2020-11-06 17:35:54 +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
7c68487bf7 For #1657, Fix utest fail 2020-11-03 17:04:05 +08:00
winlin
d2df045d0e For #1657, enable HTTPS by default 2020-11-03 16:56:05 +08:00
winlin
5577d19b61 For #1657, Refine https-client code 2020-11-03 15:54:06 +08:00
winlin
d552a1a5fb For #1657, support HTTPS client, for http-callback. 4.0.45 2020-11-03 15:45:52 +08:00
winlin
08e19406ef Player: Refine code 2020-11-02 17:21:51 +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
e71d770a26 Update 2020-10-31 21:19:41 +08:00
winlin
e830ca7d0c Research: Add huge coroutine test program 2020-10-31 21:00:09 +08:00
winlin
71c9732bff Support gdb/srs.py to stat coroutines. 4.0.44 2020-10-31 19:30:56 +08:00
winlin
8c1eca98b0 Merge SRS3.0 2020-10-31 19:25:56 +08:00
winlin
86f8cbb5eb Remove some global elements for debugging. 3.0.152 2020-10-31 18:01:16 +08:00
winlin
b348539687 Remove some global elements for debugging. 3.0.152 2020-10-31 17:53:00 +08:00
winlin
9f9e3a5d42 Use global _srs_server for debugging. 3.0.151 2020-10-31 17:47:27 +08:00
winlin
bf5e2add83 Refine source cid, track previous one. 3.0.150 2020-10-31 17:42:20 +08:00
winlin
ae56293b27 Research: Add simple ST 2020-10-31 11:30:58 +08:00
winlin
941fdebd24 Research: Add mmap demo 2020-10-30 17:49:07 +08:00
winlin
534fcabbd5 Research: Update players 2020-10-30 11:18:08 +08:00
winlin
44e550e523 Research: Add badalloc 2020-10-29 14:52:53 +08:00
winlin
a42da57448 Refine comments 2020-10-29 12:27:44 +08:00
winlin
a7961e558b Research: Learn about the function call 2020-10-29 12:02:33 +08:00
winlin
a060befebf Merge branch '3.0release' into 4.0release 2020-10-28 10:48:54 +08:00
winlin
5e7fe096a9 Refine player pages 2020-10-28 10:48:48 +08:00
winlin
f08a1a1b10 Refine etc script to collect stderr logs 2020-10-27 18:00:18 +08:00
winlin
07ecc25071 Merge branch '3.0release' into 4.0release 2020-10-25 13:49:03 +08:00
winlin
7b68330651 Add hls.realtime.conf for low-latency HLS. 3.0.149 2020-10-25 11:44:02 +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
99afdb361f Merge branch '3.0release' into 4.0release 2020-10-23 21:48:17 +08:00
winlin
aac170b75e Refine build script 2020-10-23 21:45:32 +08:00
winlin
0a09b53fc1 Refine build script 2020-10-23 21:35:46 +08:00
winlin
a51e275414 Merge SRS3 2020-10-23 21:35:13 +08:00
winlin
6dc3d85ded Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147 2020-10-23 21:32:57 +08:00
winlin
1d92ff73fb Fix build script 2020-10-23 21:24:29 +08:00
winlin
be1a1d99de Merge SRS3 2020-10-23 21:22:58 +08:00
winlin
e1ff69f292 Refine build script, use libssl in docker. 3.0.146 2020-10-23 21:14:40 +08:00
winlin
f036460164 Update default srs.conf, enable HLS and HTTP-FLV 2020-10-23 21:00:29 +08:00
winlin
4ff8a055c5 Update conf to follow wiki 2020-10-23 20:54:36 +08:00
winlin
cc6b71e1ae Update conf to follow wiki 2020-10-23 20:50:56 +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
9ef8e1bd86 RTC: Refine js for player 2020-10-14 21:11:02 +08:00
winlin
72f87e7cbc RTC: Refine js for player 2020-10-14 20:33:39 +08:00
winlin
07ea733901 Merge branch 'develop' into feature/rtc 2020-10-14 11:40:01 +08:00
winlin
bce55d2789 Merge branch '4.0release' into develop 2020-10-14 11:39:45 +08:00
winlin
913d920ec5 Merge branch '3.0release' into 4.0release 2020-10-14 11:39:26 +08:00
winlin
3f3a23f978 Fix #1987, Fix Kbps resample bug. 3.0.145 2020-10-14 11:38:54 +08:00
winlin
9c11e5077f Fix Kbps resample bug 2020-10-14 11:36:48 +08:00
winlin
b602aef56f Merge branch 'develop' into feature/rtc 2020-10-10 17:56:05 +08:00
winlin
39dc118c00 Merge branch '4.0release' into develop 2020-10-10 17:55:48 +08:00
winlin
20293e7e5d Merge 3.0release 2020-10-10 17:54:34 +08:00
winlin
5342596fc0 Update README for #1780 2020-10-10 16:47:25 +08:00
winlin
726ac03e22 Change stable release to 3.0 2020-10-10 16:38:59 +08:00
winlin
13af54171f For #1780, build fail on ubuntu:focal. 3.0.144 2020-10-10 16:20:05 +08:00
winlin
ba6462aab4 RTC: Refine DTLS ARQ, use step interval 2020-10-03 21:34:34 +08:00
winlin
e61391028e RTC: Refine utest for DTLS 2020-10-03 20:10:42 +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
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
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
winlin
5f88dc357e RTC: Support address switch 2020-07-21 11:10:20 +08:00
winlin
38f935ead8 Support get hostname 2020-07-20 20:59:28 +08:00
winlin
26f73e7593 RTC: Refine log 2020-07-20 14:39:28 +08:00
winlin
cc03449379 RTC: Remove dead code 2020-07-20 14:29:02 +08:00
winlin
c3219d5431 RTC: Allow dup play. Parse RED desc. 2020-07-20 14:15:08 +08:00
winlin
ef62cab817 RTC: Fail if callback is NULL 2020-07-20 13:55:36 +08:00
winlin
6dd77923ca RTC: Fix rtmp to rtc bug 2020-07-19 10:26:05 +08:00
winlin
7ad1dfbbb8 Merge SRS 4.0 2020-07-19 10:13:48 +08:00
winlin
8ae3ab0ba7 Merge SRS 4.0 2020-07-19 10:09:28 +08:00
winlin
715c70b6e0 RTC: Fix log issue 2020-07-19 10:07:43 +08:00
winlin
2934673d3f RTC: Create file if not exists for append 2020-07-18 09:49:27 +08:00
winlin
1beb24b48d Remove dead code 2020-07-16 13:21:55 +08:00
winlin
52a3f36b39 RTC: Support offer by server 2020-07-16 12:29:40 +08:00
winlin
f33a62e3bd Remove dead code 2020-07-15 13:56:46 +08:00
winlin
991672bf41 RTC: Refine stream/ssrc/sdp structure 2020-07-15 13:11:35 +08:00
winlin
426938cc8a JSON: Filter string filed with special char 2020-07-14 19:51:06 +08:00
winlin
dc8a63fb3c RTC: Refine config code 2020-07-14 14:01:38 +08:00
winlin
deb54b8866 Core: Refine utility string/hex 2020-07-13 14:30:44 +08:00
winlin
66aaad7805 Log: Refine context 2020-07-13 13:52:23 +08:00
winlin
0a057a0427 Log: Refine log context, use const 2020-07-13 11:19:34 +08:00
winlin
254529d946 RTC: Print offer and answer 2020-07-12 19:52:15 +08:00
winlin
041abe43fa Log: Support large log for RTC SDP. 2020-07-12 19:52:03 +08:00
winlin
b20a68ad68 RTC: Refine log 2020-07-12 09:55:35 +08:00
winlin
70c3fc78af Refine log context with random string. 4.0.35 2020-07-11 22:24:17 +08:00
winlin
778e546a11 Merge branch 'feature/rtc' into develop 2020-07-11 22:23:18 +08:00
winlin
6ee49c27ae Merge branch 'feature/las' into develop 2020-07-11 21:36:47 +08:00
liulichuan
4048869bce [bugfix]:clear cache_header_index when clear LasCache 2020-07-11 21:34:53 +08:00
yajun18
cfd6ca8ce5 fix, getsockopt SRTO_MAXBW memory overflow 2020-07-11 21:28:30 +08:00
winlin
0a16b1c1e3 Log: Refine log context. 2020-07-11 20:58:25 +08:00
winlin
d68b6b8609 Log: Fix source context print bug 2020-07-11 13:43:26 +08:00
winlin
b143717cbd Build: Change warning to -Wno-deprecated-declarations 2020-07-11 11:48:36 +08:00
winlin
a6b2e28d50 RTC: Refine the api for context. 2020-07-10 18:06:07 +08:00
winlin
22ed55e2e5 Log: Server use the root context 2020-07-09 18:30:48 +08:00
winlin
bbc168d980 RTC: Refine generate_id, never set the cid for current thread 2020-07-09 18:11:49 +08:00
winlin
7052a1fafb Log: Refine context id 2020-07-09 17:16:59 +08:00
winlin
742826a655 Log: Use 8 bytes random string as context id 2020-07-09 16:51:20 +08:00
winlin
5b199249d0 RTC: Rename SrsRtcSource to SrsRtcStream 2020-07-08 19:01:33 +08:00
winlin
428b9f14c0 RTC: Rename SrsRtcPlayer to SrsRtcPlayStream, SrsRtcPublisher to SrsRtcPublishStream 2020-07-07 17:20:15 +08:00
winlin
4c73b9a819 RTC: Rename ISrsRtcPublisher to ISrsRtcPublishStream 2020-07-07 16:57:33 +08:00
winlin
0cdfd062f2 RTC: Rename SrsRtcSession to SrsRtcConnection 2020-07-07 16:37:34 +08:00
winlin
f551ff5ae8 Log: Use string compare function 2020-07-05 23:49:47 +08:00
winlin
6624b8acca Log: Use object as context id for complex context 2020-07-05 23:26:55 +08:00
winlin
bff7ef085d Log: Allow log verbose and info 2020-07-05 22:01:03 +08:00
winlin
5f951ca126 HTTP: Fix the http parser fail bug, always reset the parser. 2020-07-04 21:25:56 +08:00
winlin
f8823dab8f ST: add srs_cond_broadcast 2020-07-04 21:18:35 +08:00
winlin
81a7c252d6 TCP: Log the remote port for client. 2020-07-04 17:19:08 +08:00
winlin
e01b98c91e HTTP: Add utest for http infinite chunked 2020-07-04 11:38:09 +08:00
winlin
671af4369b HTTP: Only enable infinite chunked for HTTP_REQUEST 2020-07-03 17:05:01 +08:00
liulichuan
c1f98ddcc8 supprot LAS(live adaptive stream) 
Change-Id: I2f9fd889fc924a3b080667bd2114f4632be461a0
 2020-07-03 11:18:10 +08:00
winlin
34e7db5a93 RTC: Fix the DTLS bug 2020-07-03 10:46:35 +08:00
winlin
d453c6c22e Fix some bugs for RTC. 4.0.34 2020-07-03 09:24:13 +08:00
winlin
c62479b112 Merge branch 'feature/rtc' into develop 2020-07-03 09:23:27 +08:00
winlin
62cadd244a RTC: Disable merge_nalus by default 2020-07-03 09:23:02 +08:00
winlin
4146346243 Merge #1830 to fix bugs in GB28181. 4.0.33 2020-07-03 09:20:02 +08:00
xiaozhihong
3bab0ad345 rtc merge_nalu default value off 2020-07-02 21:59:51 +08:00
winlin
5d561b1915 RTC: Fix build fail 2020-07-02 16:28:37 +08:00
winlin
1c3e4c71ee Fix utest fail 2020-07-02 16:28:26 +08:00
winlin
df9efb6486 RTC: Infinite chunk handle read error as EOF. 2020-07-02 16:20:32 +08:00
winlin
545a0efea3 RTC: Refine code 2020-07-02 14:51:32 +08:00
winlin
69fc1ba711 RTC: Prevent DTLS ARQ packet to dup play/publish 2020-07-02 14:51:11 +08:00
winlin
9ff8bff601 RTC: Fix the OPTIONS read, no infinited chunked mode 2020-07-02 12:41:08 +08:00
kyxlx550
65a23418ed notes w_ps_file define 2020-07-02 09:06:05 +08:00
kyxlx550
1bbf5c8126 fix ps to h264 frame_size < 0 checkt 2020-07-02 09:06:05 +08:00
kyxlx550
83c2586d79 support audio g711 2020-07-02 09:06:05 +08:00
kyxlx550
6bf1eee2bc fix ps buffer dynamic increase according to stream size 2020-07-02 09:06:05 +08:00
kyxlx550
e506191484 fix rtmp muxer cycle sleep 2020-07-02 09:06:05 +08:00
winlin
a273298e63 HTTP: Enable infinite_chunked by default 2020-06-30 19:29:23 +08:00
winlin
9e447e541b Fix utest failed 2020-06-30 10:05:01 +08:00
winlin
b72cfd2405 Refine options 2020-06-30 09:53:47 +08:00
winlin
3510c74cd4 RTC: Support drop for specified PT 2020-06-29 10:59:39 +08:00
winlin
b9bd12192b Update comment 2020-06-28 19:39:42 +08:00
jinxue.cgh
747be9047c RTC: refine twcc encode_chunk_two_bit 2020-06-28 19:32:17 +08:00
jinxue.cgh
848a073c5c RTC: send twcc in hourglass notify 2020-06-28 19:32:09 +08:00
winlin
b9355c1cc3 Fix memory leak 2020-06-28 16:58:14 +08:00
winlin
75fbcba71d RTC: Always keep and use original sequence. 2020-06-28 11:40:49 +08:00
jinxue.cgh
6662568c11 RTC: sdp surpport ssrc group encode and decode 2020-06-28 11:30:38 +08:00
winlin
f514dd78c1 Merge branch '4.0release' into develop 2020-06-28 10:28:39 +08:00
winlin
78e28dcfde Merge branch '3.0release' into 4.0release 2020-06-28 10:28:14 +08:00
winlin
5b54ceadb1 RTC: Refactor code 2020-06-27 16:14:11 +08:00
winlin
e9731fe0c1 RTC: Support ignore padding for RTP header 2020-06-27 16:12:08 +08:00
jinxue.cgh
6ff048ed35 RTC: process twcc before srtp unprotected 2020-06-27 15:59:47 +08:00
winlin
e3f1aee6c1 Release 3.0 r0, 3.0.141 2020-06-27 11:47:36 +08:00
winlin
121266ecbf Refine code 2020-06-27 11:17:37 +08:00
winlin
94ebcf6306 RTC: Support config the DTLS role and version 2020-06-27 11:13:53 +08:00
winlin
a6ade57ce5 Refine comments 2020-06-26 15:25:11 +08:00
winlin
5cc0f70f62 RTC: Refine the extensions for RTP. 2020-06-26 15:24:37 +08:00
winlin
62b70943d4 RTC: Fix TWCC delta bug. 2020-06-26 15:20:24 +08:00
winlin
94a4eaffda Ignore any dump files 2020-06-26 15:19:48 +08:00
jinxue.cgh
99016af42a RTC: transport use single srtp 2020-06-25 21:04:18 +08:00
jinxue.cgh
acf9c9d25b RTC: refine get_srtp_key parameter name 2020-06-25 21:04:13 +08:00
jinxue.cgh
b6ecb0a18f RTC: refine srtp layer 2020-06-25 21:04:09 +08:00
winlin
81d2e10f65 Refactor ISrsContext and ISrsLog 2020-06-25 13:14:59 +08:00
jinxue.cgh
2948b90f43 RTC: refine rtc dtls 2020-06-25 12:29:03 +08:00
jinxue.cgh
9addade2b4 RTC: delete SrsDTLS single instance 2020-06-24 20:54:16 +08:00
jinxue.cgh
f3f9636d80 RTC: refine dtls certificate 2020-06-24 20:54:06 +08:00
winlin
0bf0a61401 RTC: Refine DTLS code. 2020-06-24 18:03:09 +08:00
jinxue.cgh
6807299ed2 rtc: refine get dtls_context according request 2020-06-24 17:40:16 +08:00
winlin
98924943a6 Build: Refine the options for configure 2020-06-24 17:03:56 +08:00
winlin
c8892c4009 Fix build failed for no ffmpeg-fit 2020-06-24 13:52:36 +08:00
winlin
7c572dbae3 Merge branch 'feature/rtc' into develop 2020-06-24 13:46:12 +08:00
winlin
6314c273ff Support static link c++ libraries. 4.0.32 2020-06-24 13:36:18 +08:00
winlin
be5d76009e RTC: Support build without RTMP2RTC bridger, no FFmpeg fit. 2020-06-24 12:44:13 +08:00
winlin
1c72a89fca Merge branch 'feature/rtc' into develop 2020-06-23 18:58:37 +08:00
winlin
ab6bc39676 Change log cid from int to string. 4.0.31 2020-06-23 18:35:59 +08:00
winlin
acb8793140 RTC: Change reuseport to 1 2020-06-23 18:31:27 +08:00
winlin
89c0748234 Fix the empty cid issue 2020-06-23 17:39:16 +08:00
winlin
a822c841cb Merge branch '3.0release' into develop 2020-06-20 21:48:24 +08:00
winlin
ac69889b3a Link FFmpeg if exists 2020-06-20 21:48:04 +08:00
winlin
0aea46ac8b Merge remote-tracking branch 'lixin/dev-28181' into feature/gb28181 2020-06-19 13:30:13 +08:00
winlin
7627c290c9 Fix context string ID bug 2020-06-19 08:57:18 +08:00
kyxlx550
d01955443e remove sip device list locker, add sip session locker 2020-06-19 00:46:59 +08:00
jinxue.cgh
83ce78a015 tfsfu: fix compile error for bind, and warning 2020-06-18 11:48:10 +08:00
winlin
8a0c2e01f8 Log: Change cid from int to string 2020-06-18 11:45:43 +08:00
winlin
bca4ec1da1 RTC: Support set the sequence in query string 2020-06-17 15:18:14 +08:00
winlin
cfa74a0715 UDP: Refine context id 2020-06-16 19:45:55 +08:00
winlin
ab4dfbf755 RTC: Fix log typo 2020-06-16 16:50:33 +08:00
winlin
c30565b4c0 RTC: Support keep original seq 2020-06-16 16:41:04 +08:00
winlin
29661802b6 RTC: If NACK disabled, print a log. 2020-06-16 16:17:33 +08:00
winlin
cf738754ae RTC: Generate timestamp only when transcode opus to aac. 2020-06-16 13:39:02 +08:00
winlin
2c1bd6da3e Merge SRS 2020-06-14 12:35:03 +08:00
winlin
e75f28a327 GB28181 with JitterBuffer support. 4.0.29 2020-06-13 13:17:23 +08:00
winlin
1343d4f605 RTC: Disable c++14 2020-06-11 18:16:48 +08:00
莫战
db8d91cbee add c++14 support 2020-06-11 18:15:45 +08:00
winlin
31ff84c82d Ignore some files 2020-06-09 17:18:31 +08:00
winlin
b694550456 Support c++ .h and .cc 2020-06-09 17:17:36 +08:00
kyxlx550
84afc32a96 fix sip catalog status list check error 2020-06-09 10:08:41 +08:00
kyxlx550
ed82d60aac fix while sleep time 2020-06-08 18:27:03 +08:00
kyxlx550
813c83ccc7 fix no maker one frame check 2020-06-08 18:26:08 +08:00
kyxlx550
2172209321 ps to rtmp via source, h264 start code with replace nalulen 2020-06-07 21:51:06 +08:00
kyxlx550
9855e6a715 ps to rtmp via source, h264 start code with replace nalulen 2020-06-07 21:51:06 +08:00
kyxlx550
194dcf504b add ps over rtp jitter buffer 2020-06-07 21:51:05 +08:00
kyxlx550
3fe44c1c84 add lock list 2020-06-07 21:47:22 +08:00
kyxlx550
06548a7fa8 add set socket buffer func 2020-06-07 21:47:22 +08:00
kyxlx550
4fc54c9c99 add gb28181 ps jitter buffeer 2020-06-07 21:47:22 +08:00
kyxlx550
23ce929048 update gb28181 config wait_keyframe default on 2020-06-07 21:47:22 +08:00
winlin
6e04c66402 Support enable C++11. 4.0.29 2020-06-03 19:18:41 +08:00
winlin
5139816feb Remove unused files 2020-06-03 18:14:18 +08:00
winlin
0992eb4580 Remove unused files 2020-06-03 18:00:21 +08:00
winlin
812403a44d Remove srslibrtmp 2020-06-03 17:32:55 +08:00
winlin
8e519cedae RTSP: Show engine and alloc ports 2020-06-03 09:16:11 +08:00
winlin
8ca793593d RTC: Refactor code. 2020-06-02 19:00:31 +08:00
winlin
70d51ffc5b Refine build script 2020-06-02 16:43:07 +08:00
winlin
95f656b46d Merge service to protocol 2020-06-02 15:02:59 +08:00
winlin
f86706e0a2 RTC: Add config for twcc 2020-06-02 14:38:14 +08:00
winlin
32c5b6fbce RTSP: Support video only. 2020-06-02 13:45:23 +08:00
jinxue.cgh
f13a1b8ac0 rtc: fix audio rtp packet no twcc sequenc number, not reset error bug 2020-06-02 11:00:59 +08:00
jinxue.cgh
e2fcd89644 rtc: refine set extension map for rtp_header 2020-06-02 11:00:52 +08:00
winlin
f83276c457 Remove srs-librtmp. 2020-05-31 10:56:36 +08:00
winlin
b8ba4ff779 RTC: Refine code 2020-05-31 10:54:59 +08:00
winlin
899493e968 Fix build failed 2020-05-30 17:52:11 +08:00
winlin
1c5ccaffc7 RTC: Fix memory leak 2020-05-29 17:07:49 +08:00
winlin
a78b6b8cda RTC: Remove --research 2020-05-29 17:02:10 +08:00
winlin
d43d9674a3 RTC: Remove --librtmp 2020-05-29 17:00:06 +08:00
winlin
a3388bf624 RTC: Remove export srs-librtmp support 2020-05-27 14:20:40 +08:00
jinxue.cgh
b8ab6ef6ce RTC: use c++ 98 style map.erase and NULL 2020-05-27 10:15:59 +08:00
winlin
23447dd6e2 RTC: Use c++98 map.earse 2020-05-26 18:24:37 +08:00
winlin
0be9340023 Update config file. 2020-05-26 17:01:01 +08:00
winlin
db43faa848 RTC: Refine blackhole for session 2020-05-26 13:49:27 +08:00
winlin
fccbe98f70 RTC: Remove dead code, no queue_length 2020-05-26 13:45:38 +08:00
winlin
f3e1d28b6b RTC: Fix get candidate IP bug. 2020-05-26 13:08:56 +08:00
winlin
2b50326e97 HTTP: Close connection for HTTP static file server 2020-05-26 09:53:36 +08:00
winlin
f501d5b63d RTC: Support hijack play and consuming 2020-05-24 21:40:23 +08:00
winlin
a5265c5753 RTC: Add comments. 2020-05-24 21:18:46 +08:00
winlin
a246469173 RTC: Fix log typo 2020-05-22 19:06:38 +08:00
winlin
64eb22b95d RTC: Support hijack the plaintext RTP packet 2020-05-22 18:44:32 +08:00
winlin
2bd0e1ce43 Kernel: Buffer supports little-endian 2020-05-22 18:14:15 +08:00
winlin
ab2d15d524 RTC: Fix dup release bug 2020-05-21 21:59:30 +08:00
winlin
6dfeb686bf RTC: Fix session remove bug 2020-05-21 20:23:03 +08:00
winlin
471bb0914f RTC: disable GSO and sendmmsg. 4.0.27 2020-05-21 19:03:50 +08:00
winlin
aaffb8bbd7 RTC: Rename send_packets api. 2020-05-21 17:00:40 +08:00
winlin
9199e40fc1 RTC: Remove dead macros 2020-05-21 16:52:25 +08:00
winlin
01f05f920f RTC: Remove sendmmsg 2020-05-21 16:52:25 +08:00
winlin
9dfa0cc099 RTC: Disable padding 2020-05-21 16:52:25 +08:00
winlin
f03bf601e4 RTC: Directly send without sendmmsg 2020-05-21 16:52:24 +08:00
winlin
4f6b24ea12 RTC: Remove GSO for player, no premature optimization 2020-05-21 16:48:32 +08:00
winlin
5bd2812405 RTC: Merge package AV 2020-05-21 16:48:32 +08:00
winlin
690c64e046 RTC: Notify handler when session timeout 2020-05-20 20:23:21 +08:00
winlin
6a191e4077 RTC: Support destroy session 2020-05-20 19:05:00 +08:00
winlin
4c7792f0f3 RTC: Fix config bug 2020-05-20 13:51:24 +08:00
jinxue.cgh
6ce4ff56f8 rtc: rtp packet encode support twcc extension 2020-05-20 11:28:15 +08:00
winlin
eb0667ba08 RTC: Fix build failed 2020-05-19 20:47:01 +08:00
jinxue.cgh
228e2fab94 rtc: on_twcc delete trace log 2020-05-19 20:37:22 +08:00
jinxue.cgh
95596d9c38 rtc: rtpheader decode add extmap parameter 2020-05-19 20:37:16 +08:00
jinxue.cgh
3681c564d0 rtc: fix rtp header parse extension xlen caclulate bug 2020-05-19 20:37:07 +08:00
jinxue.cgh
9840ad8d55 rtc: support publish twcc using twcc config 2020-05-19 20:35:05 +08:00
jinxue.cgh
d5e91694d5 rtc: publisher support twcc 2020-05-19 20:34:45 +08:00
jinxue.cgh
b116632357 rtc: sdp support decode and encode extmap 2020-05-19 20:31:08 +08:00
jinxue.cgh
705843b512 rtc: support parse rtp packet extension 2020-05-19 20:30:38 +08:00
winlin
69e4a1b5e7 RTC: Refactor variable name 2020-05-19 18:06:12 +08:00
winlin
e3d010113f RTC: Refactor code 2020-05-19 17:49:34 +08:00
winlin
23ddcbdaed Update authors 2020-05-17 21:49:15 +08:00
winlin
3029394c58 RTC: Refactor code 2020-05-17 21:45:50 +08:00
忘篱
5a998e58f5 RTC: Simulator drop packet before SRTP 2020-05-17 21:33:48 +08:00
忘篱
5257f16796 RTC: Attach detail error info when SRTP error 2020-05-17 21:17:44 +08:00
忘篱
d2b0e73884 RTC: Revert not required modifications 2020-05-17 20:43:49 +08:00
忘篱
e9af081f7b RTC: Revert not required modifications 2020-05-17 20:43:46 +08:00
jinxue.cgh
4895770214 tenfold: modify nack options 2020-05-17 20:43:04 +08:00
jinxue.cgh
efe90c36a7 tenfold: add nack option desc 2020-05-17 20:42:48 +08:00
jinxue.cgh
347fafec6e tenfold: refine publish nack send 2020-05-17 20:42:30 +08:00
jinxue.cgh
a3c7be2c75 tenfold: implement nack ringbuffer notify_nack_list_full and notify_drop_seq 2020-05-17 20:42:12 +08:00
jinxue.cgh
c875639eb6 tenfold: use timer send nacks 2020-05-17 20:41:52 +08:00
jinxue.cgh
392e2c8161 tenfold: add publish nack 2020-05-17 20:41:35 +08:00
忘篱
f5ba274019 RTC: Refine RTCP names. 2020-05-17 20:23:57 +08:00
忘篱
d6d2554c7f RTC: Refine comments for TWCC 2020-05-17 20:20:06 +08:00
忘篱
e1bede91f4 RTC: Add api files. 2020-05-17 19:46:18 +08:00
忘篱
acc53ded89 RTC: Extract RTC api file 2020-05-17 19:40:45 +08:00
忘篱
d603b1580e RTC: Merge srs_rtp_seq_distance with srs_seq_is_newer 2020-05-17 09:03:40 +08:00
忘篱
3f5ab8dc63 RTC: Add utest for srs_rtp_seq_distance 2020-05-17 00:03:14 +08:00
忘篱
be1b0bf941 RTC: Refactor code 2020-05-15 18:06:25 +08:00
忘篱
d1485c40e4 RTC: Rename APIs 2020-05-15 15:36:55 +08:00
忘篱
99496ed24c RTC: Remove dead code 2020-05-15 12:07:11 +08:00
忘篱
e20a1d2f39 RTC: Rename RTCP_XXX to RtcpXXX 2020-05-15 12:03:43 +08:00
忘篱
cef8be4a46 RTC: Support RTCP codec. 2020-05-15 11:50:59 +08:00
莫战
9910151feb add twcc and replace auto method 2020-05-15 09:55:15 +08:00
winlin
f510a94a91 RTC: Rename SrsRtpPacket2.rtp_header to SrsRtpPacket2.header 2020-05-15 08:38:43 +08:00
winlin
ba8f2e2aba RTC: Remove dead code 2020-05-15 08:34:58 +08:00
winlin
620ca902e2 RTC: Remove dead code 2020-05-15 08:24:26 +08:00
winlin
d8cf9b64c8 RTC: Remove dead code 2020-05-15 08:19:22 +08:00
winlin
c7b88e08e9 RTC: Refactor API, use shared pkt for consumer 2020-05-15 08:11:03 +08:00
winlin
31de2c71d0 RTC: Reorder code for NACK. 2020-05-15 07:57:40 +08:00
winlin
f2951ec46a RTC: Reorder class, no change 2020-05-14 18:34:33 +08:00
winlin
ab6e3cae52 RTC: Refine NACK, remove dead code 2020-05-14 18:33:31 +08:00
winlin
f81d35d20f RTC: Rename padding API. 2020-05-14 15:01:12 +08:00
winlin
e8973c2343 RTC: Refactor, rename SrsRtcOutgoingPackets to SrsRtcOutgoingInfo 2020-05-14 14:45:54 +08:00
winlin
5e2a3572eb RTC: Remove cache for RTP packet 2020-05-14 14:44:24 +08:00
winlin
7b0a9fe95f RTC: Remove shared bytes, use shared msg 2020-05-14 14:30:32 +08:00
winlin
f794a7d3a7 RTC: Use shared message for RTP packet 2020-05-14 14:26:19 +08:00
winlin
4e1935f678 RTC: Fix GSO build failed in linux 2020-05-14 13:14:52 +08:00
winlin
3cb797dccd For #307, refine core structure, RTMP base on frame, RTC base on RTP. 4.0.26 2020-05-14 10:47:21 +08:00
winlin
2b1c4a188a RTC: Refine RTMP bridge to RTC, use RTP packets in consumer 2020-05-14 09:33:00 +08:00
winlin
54d8c36905 RTC: Refine audio to RTP packet base. 2020-05-13 20:13:25 +08:00
winlin
588d17c09d RTC: Refactor source to accept RTP audio packet. 2020-05-13 18:43:25 +08:00
winlin
377128f4e9 RTC: Rename recode to transcode 2020-05-13 17:56:51 +08:00
winlin
b8b52f28f5 RTC: We should cache the sps/pps in source. 2020-05-13 16:21:42 +08:00
winlin
68de796f77 RTC: Reorder functions 2020-05-13 15:46:49 +08:00
winlin
9b334f91e7 RTC: Fix build failed 2020-05-13 15:27:31 +08:00
winlin
431f852e05 RTC: Remove dead code 2020-05-13 15:23:43 +08:00
winlin
e446cf466f RTC: Extract video to bridger 2020-05-13 15:15:57 +08:00
winlin
8efbdec2af RTC: Remove dead code 2020-05-13 15:13:14 +08:00
winlin
c0021ab78a RTC: Directly use audio transcoder. 2020-05-13 15:09:36 +08:00
winlin
6740a03a9c RTC: Refactor code 2020-05-13 13:42:55 +08:00
winlin
44c8334b71 RTC: Extract codes from source to bridger. 2020-05-13 13:35:14 +08:00
winlin
16c47056a6 RTC: Remove dead code. 2020-05-13 13:15:41 +08:00
winlin
ede6684f12 Fix build failed bug 2020-05-12 19:59:46 +08:00
winlin
9e417d5416 Refine SrsSource, bridge to RTC. 2020-05-12 19:53:21 +08:00
winlin
d2e5cd7bb7 RTC: Refine code, remove pass_timestamp from SrsSource 2020-05-12 13:51:51 +08:00
winlin
d434dc951d RTC: Cleanup code, remove RTC from SrsSource 2020-05-12 13:43:09 +08:00
winlin
25496b734b RTC: Extract RTC Source and Consumer 2020-05-12 13:19:31 +08:00
winlin
0b9887bbcd RTC: Rename RTC files. 2020-05-11 12:07:55 +08:00
winlin
3a58d9859c RTC: Extract rtc server in app 2020-05-11 11:45:20 +08:00
winlin
a757b7f903 Support RTC player NACK 2020-05-09 11:11:36 +08:00
winlin
c31ffc40e4 Support filter RTC candidate by ip family, ipv4 by default. 2020-05-09 10:53:52 +08:00
莫战
a72dce494d add rtcp support 2020-05-09 10:51:57 +08:00
winlin
215b1c234b Refine the local ip and interface retrieve 2020-05-09 10:40:25 +08:00
winlin
26bcc09017 Refine on_rtcp for RTC 2020-05-08 16:25:09 +08:00
winlin
9614af070c Support simulator link in DEMO page 2020-05-07 18:28:59 +08:00
winlin
db503975fb Disable simulator API by default. 2020-05-07 16:29:11 +08:00
winlin
fe01a504b6 Fix RTP decode bug 2020-05-07 16:12:04 +08:00
winlin
6fbd41cff4 Refactor the logs. 2020-05-07 16:01:03 +08:00
winlin
1b08fb6b6e Remove unused code 2020-05-06 15:13:18 +08:00
winlin
7dd5db261a Support server as offer 2020-05-06 07:37:00 +08:00
winlin
8933e6f429 Fix utest build failed. 2020-05-05 08:35:16 +08:00
winlin
c4b93b8a38 Refactor RTC video queue, extract RTP video packet 2020-05-05 08:24:49 +08:00
winlin
899dddb624 Refactor RTC publisher, audio/video use its special ring buffer 2020-05-05 08:08:03 +08:00
winlin
80d45e5982 Refine RTP ring buffer, change to template 2020-05-05 07:42:27 +08:00
winlin
42ae71e96c Refactor RTC publish queue 2020-05-05 06:41:19 +08:00
winlin
8c4b6d3166 Support disable NACK in config 2020-05-04 20:42:30 +08:00
winlin
d125116317 Support simulate NACK for RTC publisher 2020-05-04 17:49:39 +08:00
winlin
4d33070c59 Support NACK for RTC player 2020-05-04 14:47:58 +08:00
winlin
d462b750fb Add TODO: Should not wait for NACK packets. 2020-05-04 08:14:37 +08:00
winlin
f04e63edbf Refactor code, support NACK and NACK PLI in SDP 2020-05-04 07:52:29 +08:00
winlin
15955b6cdd Refactor the RTP packet. 2020-05-04 07:40:02 +08:00
winlin
47df22df9e Refine RTC, no trickle for ice-lite, disable algorithms right-now 2020-05-03 20:19:45 +08:00
winlin
365e6bb45a Refine RTC publisher, no cache. 4.0.25 2020-05-03 19:09:48 +08:00
winlin
128fc9d8c7 Refactor publisher ring buffer, allow startup drop frame 2020-05-03 18:07:09 +08:00
winlin
2dc8e8dca1 Refactor RTC publish ring buffer 2020-05-03 17:57:07 +08:00
winlin
45f35e3ec8 Refactor RTC publisher, rename pkt to frame 2020-05-03 17:43:38 +08:00
winlin
47ed16eda1 Refactor RTC publisher queue, covert FU-A to RAW. 2020-05-03 17:41:00 +08:00
winlin
a812183144 Refactor the RTC sender audio queue 2020-05-03 14:28:51 +08:00
winlin
a23f102874 Refactor RTC, rename variables. 2020-05-03 13:49:53 +08:00
winlin
9c8b7279f0 Refactor RTC publisher queue, rename sender to player 2020-05-03 13:37:04 +08:00
winlin
ef64c5e2bd Refine RTC, reject when config disabled. 2020-05-03 13:11:38 +08:00
winlin
f71b833520 Refine sendmmsg, move to ST 2020-05-03 11:32:54 +08:00
winlin
2a0562da5e Refine RTC, disable NASM, SENDMMSG, SRTP-NASM 2020-05-03 11:14:11 +08:00
winlin
32c4febafe Refactor RTC publish packet flags. 2020-05-03 10:15:54 +08:00
winlin
157bc713a9 Refactor RTC session API 2020-05-03 09:55:43 +08:00
winlin
5fb7c4efbc RTC supports pass-by players PLI to publisher 2020-05-03 09:00:05 +08:00
winlin
1688d53f7d Refine source, pass-by RTC publisher for player 2020-05-03 07:51:01 +08:00
winlin
20b4984af4 Refine consumer dumps, extract dumps API 2020-05-03 07:43:05 +08:00
winlin
9906d2e859 Refine RTC publish SDP, remove SSRC because it's recvonly. 2020-05-03 07:22:07 +08:00
winlin
780753c0ec Refine code for RTC publisher 2020-05-02 20:57:36 +08:00
winlin
5c43037190 Remove usused RTP shared packet. 2020-05-02 10:24:31 +08:00
winlin
42ee52fa29 Refactor code, extract nack from queue 2020-05-02 10:07:55 +08:00
winlin
f57e8de3f9 Refactor code, rename rtp_xxx_queue to xxx_queue_ 2020-05-02 09:53:49 +08:00
winlin
b3a0284db5 Refactor code to split implementation to cpp 2020-05-02 09:48:04 +08:00
winlin
6f2b78f16a Refactor code to keep sample function order 2020-05-02 09:15:49 +08:00
winlin
7b5fa0e391 Refactor kernel buffer 2020-04-30 20:46:45 +08:00
winlin
d045ce5d74 Refine kernel buffer API. 2020-04-30 19:33:08 +08:00
winlin
efbc51f6be Refactor RTC sender, donot cache it. 2020-04-30 18:19:40 +08:00
winlin
fdcff3e6c2 Refactor code, remove skt in param 2020-04-30 14:49:37 +08:00
winlin
5ee5ef6ab2 For #307, support publish RTC with passing opus. 4.0.24 2020-04-30 10:57:03 +08:00
winlin
99f9f566ba Refactor RTC function names 2020-04-30 10:00:07 +08:00
winlin
583ae52df8 Rename functions for RTC publisher 2020-04-30 09:33:21 +08:00
winlin
f37ffdf740 For RTC publisher, request keyframe when start playing 2020-04-30 08:24:15 +08:00
winlin
ed338f4c0a Refactor macro SRS_AUTO_XXX to SRS_XXX. 2020-04-29 20:02:28 +08:00
winlin
2fe1874a87 For RTC publish, refine the ring buffer. 2020-04-29 19:07:44 +08:00
winlin
5eba90ded9 Refine build script 2020-04-29 19:07:25 +08:00
winlin
0b62ca02b7 Merge develop 2020-04-27 14:01:33 +08:00
winlin
ded37c6719 Refine build script 2020-04-27 13:59:57 +08:00
winlin
89cdfe2f50 Refactor RTC publisher code 2020-04-27 13:45:50 +08:00
winlin
7692e589ed For RTC publisher, support black-hole 2020-04-27 09:35:50 +08:00
winlin
028ef56772 Fix sendmmsg build failed bug 2020-04-26 22:41:03 +08:00
winlin
e4329fd1a0 Refactor RTC, create source once 2020-04-26 19:00:36 +08:00
winlin
cef1ba9385 Update doc 2020-04-26 16:16:34 +08:00
winlin
db586903ba Refactor RTC source create 2020-04-26 16:12:23 +08:00
winlin
eace693ae9 Refactor RTC publish, reorder functions. 2020-04-26 13:30:17 +08:00
winlin
ebdc03416a Free rtc publish. Refactor TAB to spaces 2020-04-25 22:30:55 +08:00
winlin
cd3c15ec4e Support RTC publisher. 2020-04-25 20:32:37 +08:00
winlin
70a81b3970 Fix the bug for RTC publisher 2020-04-25 18:59:02 +08:00
xiaozhihong
bb9367f88a add rtc_publisher.html 2020-04-24 16:22:08 +08:00
xiaozhihong
c068a94f6f Merge remote-tracking branch 'upstream/feature/rtc' into rtc 2020-04-24 16:19:24 +08:00
xiaozhihong
8dc0746e2d rtc publish release 2020-04-24 16:19:08 +08:00
winlin
613baa561a Update script 2020-04-24 09:42:15 +08:00
xiaozhihong
775065175a rtc session distinguish play and publish 2020-04-24 00:06:59 +08:00
xiaozhihong
1951cc8e5f remove some debug code 2020-04-23 23:14:30 +08:00
xiaozhihong
a061d5c3db rtc publish, with debug code 2020-04-23 17:08:21 +08:00
xiaozhihong
c654f1e06e Merge remote-tracking branch 'upstream/feature/rtc' into rtc 2020-04-22 22:19:41 +08:00
winlin
32082648b6 Merge branch 'feature/rtc' into develop 2020-04-22 11:39:26 +08:00
winlin
ee1002fc3d Fix OSX utest failed. 2020-04-22 11:39:18 +08:00
winlin
38f7299a51 Remove double check for FFMPEG 2020-04-22 09:28:13 +08:00
winlin
854247e979 Fix GB28181 build failed. 2020-04-21 15:38:31 +08:00
winlin
dabad68f48 Merge branch 'feature/gb28181' into develop 2020-04-21 15:27:40 +08:00
winlin
82396ec112 Refactor GB28181 code 2020-04-21 15:25:50 +08:00
winlin
7bec73f224 Refactor demo pages. 2020-04-21 15:13:46 +08:00
winlin
244fefa8c5 Update utest 2020-04-21 15:06:57 +08:00
winlin
f2b575e841 Merge branch 'feature/rtc' into develop 2020-04-21 14:04:27 +08:00
winlin
20896325ea Update script 2020-04-21 14:02:26 +08:00
winlin
bff93c3f6a Update ST doc 2020-04-21 13:30:00 +08:00
kyxlx550
904ce2452b update srs gb28281 web demo 2020-04-21 12:53:52 +08:00
winlin
74800d0137 Refactor code 2020-04-21 12:18:49 +08:00
winlin
511cf65ec8 Add srs_recvmsg 2020-04-21 12:14:26 +08:00
winlin
0fe9d9e324 Add UDP ZeroCopy research 2020-04-21 12:12:32 +08:00
kyxlx550
6a070a9a64 support sip ptz cmd 2020-04-20 21:34:18 +08:00
winlin
74416e476a Refine research zerocopy, use batch for reception 2020-04-20 21:18:49 +08:00
winlin
72322836c6 Update demo for zerocopy 2020-04-20 20:25:23 +08:00
winlin
a3de167bc7 For zerocopy research, support delay in server 2020-04-20 08:42:53 +08:00
winlin
8f9cc38f68 Refine zero copy research 2020-04-20 08:02:53 +08:00
winlin
2e9a561acf Update research zerocopy 2020-04-19 22:16:54 +08:00
winlin
c362bfc3ab Add msg zerocopy research code 2020-04-19 21:58:39 +08:00
winlin
a579f51e72 Remove ST in research 2020-04-19 20:51:39 +08:00
xiaozhihong
749503a12e merge upstream feature/rtc, solve conflict 2020-04-19 15:02:21 +08:00
winlin
32879eaf47 Fix double free bug for RTP 2020-04-19 13:16:48 +08:00
winlin
6a4e043349 Fix the double free bug 2020-04-19 11:22:18 +08:00
winlin
b1df04cb09 Fix double free bug for RTP 2020-04-19 09:32:09 +08:00
kyxlx550
167711400a fix cascade SIP bye failed 2020-04-19 00:18:30 +08:00
winlin
ce36a970ff Refine perf stat 2020-04-18 22:55:38 +08:00
winlin
c93cd86ce4 For #307, refine performance 2020-04-18 20:37:08 +08:00
winlin
9e031c9932 Update script 2020-04-18 15:34:36 +08:00
winlin
c1464f5aee Use extra queue when set mw_msgs 2020-04-18 10:35:30 +08:00
winlin
08312ddc42 Support config the mw_sleep and mw_msgs 2020-04-18 10:04:45 +08:00
winlin
b0566d51ef Refine play consume message for RTC 2020-04-18 08:33:35 +08:00
winlin
170b7453f4 Refine for performance 2020-04-18 08:10:28 +08:00
winlin
cf52390cf2 Support fast padding 2020-04-17 18:04:52 +08:00
kyxlx550
fb23739113 fix use gb28181 log id 2020-04-17 17:03:03 +08:00
winlin
e4eb501c57 Fix the perf stat bytes bug 2020-04-17 16:36:56 +08:00
winlin
36d06edab3 Refine performance 2020-04-17 14:24:24 +08:00
winlin
54b6a9faa7 Refactor for performance 2020-04-17 13:02:54 +08:00
winlin
cac5bbddf6 Refine comments 2020-04-17 12:48:05 +08:00
winlin
14e3ec2fe8 For #307, drop frame when VBR too high 2020-04-17 12:30:53 +08:00
winlin
606f8873b3 Refactor code 2020-04-17 10:42:04 +08:00
winlin
acc471b0a9 For #307, refine the GSO for performance 2020-04-17 07:58:11 +08:00
winlin
21ede1f084 Enable perf stat by default 2020-04-17 07:57:52 +08:00
winlin
f0015a7cc1 For #307, refine GSO performance, alloc iovs 2020-04-17 07:10:16 +08:00
kyxlx550
98c29b2b9a fix sip stack param check error 2020-04-17 00:17:47 +08:00
winlin
8383f1b27a Improve performance for GSO 2020-04-16 19:33:10 +08:00
winlin
32f43a9920 For RTC, always try to read message first, to improve performance 2020-04-16 18:52:17 +08:00
winlin
1a6e055f7f Support config to disable stat to improve performance. 2020-04-16 18:37:37 +08:00
kyxlx550
06412ddddc fix gb28281 html ret error show 2020-04-16 18:33:43 +08:00
winlin
810b32138e Refactor code 2020-04-16 18:25:11 +08:00
winlin
634225f92f Improve perforance of marshaling RTP header 2020-04-16 18:04:56 +08:00
winlin
3bd56bb3a3 For #307, reuse fua cache payload for RTP 2020-04-16 14:51:36 +08:00
winlin
d5c514cdcb For #307, reuse raw cache payload for RTP 2020-04-16 14:28:59 +08:00
winlin
d906ced5c3 For #307, set cache to about 1.4GB when clients is 2k 2020-04-16 14:13:09 +08:00
winlin
bbe4b3797d Refactor stat logs for RTC 2020-04-16 13:49:37 +08:00
winlin
e90f0629ed Refactor RTP cache reset 2020-04-16 13:13:02 +08:00
kyxlx550
b391ed6206 fix gb28281 html rtc player stop 2020-04-16 13:08:42 +08:00
winlin
b4a7566684 Print the rtp packets cache capacity 2020-04-16 12:35:36 +08:00
kyxlx550
33b91cd6f2 fix gb28181 api error code 2020-04-16 12:30:11 +08:00
winlin
cc831be985 Refactor variable name for GSO 2020-04-16 12:18:52 +08:00
winlin
92419f9836 For #307, refine GSO padding algorithm 2020-04-16 11:57:11 +08:00
winlin
34fec09bc0 Refactor padding 2020-04-16 11:22:25 +08:00
winlin
4dced0b077 For #307, fix apdding algorithm bug. 2020-04-16 10:58:20 +08:00
winlin
b91e07f475 For #307, change max padding to 127 for GSO. 2020-04-16 10:25:12 +08:00
winlin
5ad99b119d Stat bytes 2020-04-16 10:05:17 +08:00
winlin
b7dab00f36 Add debug_id for GSO 2020-04-16 09:25:18 +08:00
winlin
56995db6a5 Refine debug info 2020-04-16 09:09:10 +08:00
winlin
ef48507e80 Support padding max to 127 2020-04-16 09:07:42 +08:00
winlin
a4dbf3ca8a Fix RTP packet cache bug 2020-04-16 08:43:54 +08:00
winlin
7d1be87124 Fix RTP packet cache bug 2020-04-16 08:30:57 +08:00
winlin
1064429c7e Cache RTP packets 2020-04-15 22:46:06 +08:00
winlin
7b68f55edc Refactor GSO mmsghdr alloc 2020-04-15 22:11:03 +08:00
kyxlx550
7950bc586e add gb28281 demo html 2020-04-15 22:05:32 +08:00
winlin
c96ffd272c Cache RTP packet vector 2020-04-15 21:59:27 +08:00
winlin
d692f2d9c4 Fix build failed when RTC disabled. 2020-04-15 21:37:46 +08:00
winlin
7c6583684e RTC: Reorder AV for GSO 2020-04-15 19:53:23 +08:00
winlin
c95a8517e7 For #307, padding to next packet or GSO size 2020-04-15 17:48:52 +08:00
winlin
bbdd2d7eed For #307, support padding for GSO 2020-04-15 15:58:17 +08:00
winlin
6869ccca50 Fix RTP padding bug 2020-04-15 14:19:00 +08:00
kyxlx550
95b869245b fix sip message parse error 2020-04-15 12:06:27 +08:00
winlin
bfc70d6482 For #307: Change the RTP payload to 1300 2020-04-15 12:05:27 +08:00
winlin
b5f2c842fe Fix perf api bug 2020-04-15 10:50:56 +08:00
winlin
ab53c34945 For #307: Change the RTP payload to 1400 2020-04-15 10:44:26 +08:00
winlin
095e7c5a4e Fix build script 2020-04-15 10:36:39 +08:00
winlin
6e9e0d6ce3 Fix build script 2020-04-15 10:35:38 +08:00
xiaozhihong
e0cd148ad6 merge 2020-04-15 10:31:38 +08:00
winlin
c143c80fd6 Fix GSO stat bug 2020-04-15 07:10:41 +08:00
winlin
dd7b5cf53f Fix GSO stat bug 2020-04-15 06:44:09 +08:00
winlin
649f2042da Update perf tool 2020-04-14 22:16:14 +08:00
winlin
6cf9933bf3 For #307, refine gperf api 2020-04-14 21:49:49 +08:00
winlin
a80084289b Support debug 2020-04-14 20:12:33 +08:00
winlin
8e4ef98629 For #307, correct the RTP packet stat. 2020-04-14 20:12:14 +08:00
winlin
9d5c855727 Update perf api tool 2020-04-14 19:36:43 +08:00
winlin
88b1e14db4 Update perf api tool 2020-04-14 19:30:35 +08:00
winlin
97cfae624c Fix CentOS8 build warnings 2020-04-14 19:23:15 +08:00
winlin
bda7bdee54 Change RTC realtime to 0 cache 2020-04-14 19:19:46 +08:00
winlin
4be1d785b6 Add tool for GSO 2020-04-14 18:50:21 +08:00
winlin
7c3522dcb1 Add tool for GSO 2020-04-14 18:49:26 +08:00
winlin
de343d6547 Add tool for GSO 2020-04-14 18:48:57 +08:00
winlin
8d5f91f777 For rtc player, use target to overwrite server, vhost and eip. 2020-04-14 18:15:07 +08:00
winlin
ba3d293bfd Refactor stat for frames 2020-04-14 14:22:30 +08:00
winlin
7574dbefb1 For #307, support sendmmsg, GSO and reuseport. 4.0.23 2020-04-14 14:02:54 +08:00
winlin
fdc0c44b7e For #307, for realtime, change wait messages from 0 to 2 2020-04-14 13:55:55 +08:00
winlin
03a03e4174 Refine stat for GSO 2020-04-14 13:47:23 +08:00
winlin
5b406d68d6 Refine pithy print 2020-04-14 13:34:24 +08:00
winlin
39853160d1 Refactor default config 2020-04-14 11:49:59 +08:00
winlin
b6a929f9cf Enable GSO by default 2020-04-14 11:41:23 +08:00
winlin
24eb61156f Refine logs for GSO 2020-04-14 11:39:22 +08:00
winlin
8ba3d78e86 Refine logs for GSO 2020-04-14 11:30:21 +08:00
winlin
2cd580f500 For #307, disable GSO < linux 4.18.0 2020-04-14 11:26:45 +08:00
winlin
feaf98eb69 For #307, remove dedicate GSO cache 2020-04-14 10:58:53 +08:00
winlin
23c68a922c Refine GSO for RTC 2020-04-14 10:05:55 +08:00
winlin
8a71ce62db For #307, allow dedicated cache for GSO. 2020-04-14 09:20:21 +08:00
winlin
89a247d9bc Remove unused code 2020-04-13 23:57:03 +08:00
winlin
3b7240b8e0 For #307, support linux GSO for RTC 2020-04-13 23:40:30 +08:00
winlin
b1438bf52c Merge branch 'develop' into feature/rtc 2020-04-13 19:51:35 +08:00
winlin
f072f30854 Merge branch '4.0release' into develop 2020-04-13 19:51:13 +08:00
winlin
bfe40f0115 Check pkg-config 2020-04-13 19:50:40 +08:00
winlin
96059e0d42 For #307, support merge multiple slices/NALUs to one NALU/RTP/FUA 2020-04-13 19:23:17 +08:00
winlin
5d23bb6a8a Refactor code for merge_nalus 2020-04-13 17:11:46 +08:00
winlin
4400896395 Refactor code for merge_nalus and gso 2020-04-13 16:50:24 +08:00
winlin
048301d9eb Refactor RTP sender 2020-04-13 15:37:32 +08:00
winlin
756826756a Refactor RTP encrypt 2020-04-13 15:24:41 +08:00
xiaozhihong
54a887a3d9 solve merge conflict 2020-04-13 14:43:12 +08:00
xiaozhihong
8687c50dc4 merge 2020-04-13 14:29:19 +08:00
winlin
fa21df7bb8 Refactor RTC package RTP packets. 2020-04-13 13:58:34 +08:00
winlin
0bb61f7d98 For #307, RTC RTP support padding 2020-04-13 13:44:55 +08:00
winlin
216b3bf414 Create isolate pithy printer for each RTC FD 2020-04-13 09:32:48 +08:00
winlin
087559813f For #307, use UDP sender binding to FD for RTC 2020-04-13 09:13:12 +08:00
winlin
863d6b4f15 Refactor pithy print for RTC 2020-04-12 23:11:53 +08:00
winlin
59dc771dd5 Refactor pithy print for RTC 2020-04-12 23:05:07 +08:00
winlin
73a9155686 Refine logs 2020-04-12 18:34:42 +08:00
winlin
82579e4b0c For #370, use round-trip to send on all fds 2020-04-12 17:19:49 +08:00
winlin
37e2f8896c Refactor pithy print logs 2020-04-12 16:31:32 +08:00
winlin
d5b3cf9af7 Refactor pithy print logs 2020-04-12 16:10:08 +08:00
winlin
2b132d6d64 Refine RTC server log 2020-04-12 09:17:52 +08:00
winlin
78aad11eeb For #307, enable REUSEPORT to increase UDP buffer 2020-04-12 08:55:43 +08:00
winlin
a7f2bde8e2 Refine UDP socketopt logs 2020-04-12 08:42:12 +08:00
winlin
edad6ac93d Fix memory leak. Refine RTC SEND pithy print message 2020-04-12 08:25:57 +08:00
winlin
5e66a0d342 Send SPS/PPS before IDR 2020-04-12 01:13:31 +08:00
winlin
79d46fa2e1 Fix build failed bug 2020-04-12 01:08:21 +08:00
winlin
32efc71ba9 Fix the STAP NRI flag 2020-04-12 01:05:32 +08:00
winlin
acbbdf51d6 Refacor STAP RTP packet 2020-04-12 01:05:11 +08:00
winlin
ca027ca5cb For #307, zero copy for RTP FUA packet 2020-04-12 01:01:39 +08:00
winlin
aa81b47c9a For #307, zero copy for RTP STAP packet 2020-04-11 23:57:04 +08:00
winlin
4b2404c203 For #307, zero copy for RTP audio packet 2020-04-11 22:54:44 +08:00
winlin
bf62244908 Free RTP packet for RTC 2020-04-11 21:46:34 +08:00
winlin
a2fdf0d3c7 For #307, package video rtp packets when send message 2020-04-11 21:03:37 +08:00
kyxlx550
7826c743e4 support access to NVR, gb28181 system sub domain 2020-04-11 20:37:07 +08:00
kyxlx550
28bde1d448 fix rtmp send timeout, first key frame wait 2020-04-11 20:36:28 +08:00
kyxlx550
f74a398c1b add sip query session api 2020-04-11 20:19:54 +08:00
kyxlx550
1e0474e470 support sip query catalog message, parse xml to map, nvr 2020-04-11 20:18:38 +08:00
kyxlx550
769efa87c3 add sip device channel error code 2020-04-11 20:01:35 +08:00
kyxlx550
3d1c34a45e add gbs log id define 2020-04-11 20:00:31 +08:00
kyxlx550
917b87a1d6 add sip query catalog interval config 2020-04-11 19:56:46 +08:00
kyxlx550
0d593da998 trunk/conf/full.conf 
add sip query catalog interval config
 2020-04-11 19:55:42 +08:00
winlin
8121f9ab4e Refactor variable name 2020-04-11 18:39:46 +08:00
winlin
c6fb5e6fdd Refactor code, rename variable 2020-04-11 18:01:38 +08:00
winlin
3cccef327c For #307, package opus when send it. 2020-04-11 17:52:14 +08:00
winlin
1f2db4d746 For #307, refactor aac to opus code 2020-04-11 17:09:55 +08:00
winlin
6ed2a4b6cb For #307, refine audio transcode buffer 2020-04-11 16:33:47 +08:00
winlin
7ffe4aacb8 For #307, refactor shared msg, add samples and extra payload 2020-04-11 15:26:20 +08:00
winlin
5b9cb7dc3f For #307, refactor code, parse B-frame by sample. 2020-04-11 15:11:42 +08:00
winlin
719c0ae85b For #307, refactor SPS/PPS only before IDR, not each FUA 2020-04-11 13:10:27 +08:00
winlin
a695afb368 Refactor code to rename rtp_shared_pkt to packet 2020-04-11 09:56:58 +08:00
winlin
a1371fe93c Fix utest warnings 2020-04-11 09:11:46 +08:00
winlin
1ecd8bee40 Refactor bframe discard strategy 2020-04-11 09:11:34 +08:00
winlin
fca81f02f5 Refactor code, add comment when string.assign(xx, 0) 2020-04-11 09:00:50 +08:00
winlin
162055f6d0 Refactor variable name 2020-04-10 19:21:47 +08:00
winlin
d6a5651a30 For #307, support reload rtc_server section 2020-04-10 18:14:33 +08:00
winlin
928d863e50 Refactor code, use pithy print for RTC send. 2020-04-10 17:42:54 +08:00
winlin
94afe6c56e Refactor the print message 2020-04-10 15:44:46 +08:00
winlin
40eb5c0ef5 For #307, disable vappi for FFmpeg-fit 2020-04-10 08:55:04 +08:00
winlin
9b2f429571 Allows empty body metadata. 2020-04-09 20:43:51 +08:00
winlin
c54d5be93c For #307, refine RTP packet cache. 2020-04-09 19:38:50 +08:00
xiaozhihong
c81bc36712 add rtc stun/dtls log 2020-04-09 14:34:48 +08:00
winlin
1e83749485 For #307, use RTC server to sendmmsg 2020-04-09 09:56:13 +08:00
winlin
cf48a5594d Refactor code for #1691 2020-04-09 08:37:28 +08:00
winlin
49f88a3326
Merge pull request #1691 from xialixin/dev-28181 
Dev 28181
 2020-04-09 08:28:53 +08:00
winlin
d9a5572531 Refine TAB to spaces. 2020-04-09 08:20:55 +08:00
xiaozhihong
85fcbad778 [1].Add 'stun_strict_check' in conf file 
[2].Try to pickup at least H.264 payload type
 2020-04-08 23:24:59 +08:00
xiaozhihong
55f264b704 Merge remote-tracking branch 'upstream/feature/rtc' into rtc 2020-04-08 20:40:23 +08:00
winlin
99614ac585 Support set RTC stun timeout 2020-04-08 15:22:13 +08:00
xiaozhihong
ca7060c005 Add SrsRtpHeader. 2020-04-08 14:45:26 +08:00
winlin
e6e8605304 For #307, support config RTC session timeout 2020-04-08 13:30:28 +08:00
winlin
8e0f83fdd2 Fix CentOS8 build failed 2020-04-07 20:22:18 +08:00
winlin
11bcd0cb27 Merge branch 'develop' into feature/rtc 2020-04-07 20:19:06 +08:00
winlin
737e4fce9f Merge branch '4.0release' into develop 2020-04-07 20:18:48 +08:00
winlin
61c7443c4b Merge from SRS3 2020-04-07 20:18:31 +08:00
winlin
c2657bf672 Use isolate cache for different SRS version. 2020-04-07 20:11:56 +08:00
winlin
32d5b75d8c For #307, fix some memory leaking 2020-04-07 19:47:04 +08:00
winlin
a8cc3a3430 For #307, fix some memory leaking 2020-04-07 19:07:11 +08:00
winlin
e22d1dffc1 Merge remote-tracking branch 'john/rtc' into feature/rtc 2020-04-07 17:30:06 +08:00
winlin
fa635e3333 Refine sendmmsg detect script 2020-04-07 17:28:24 +08:00
winlin
6c5b51618c For #307, support config to send plaintext RTP. 2020-04-07 16:05:31 +08:00
winlin
00810e6d1d Refine api for tcmalloc 2020-04-07 14:43:18 +08:00
winlin
963720e1eb Fix tcmalloc build bug 2020-04-07 14:30:17 +08:00
winlin
35a037cf05 Add api for tcmalloc 2020-04-07 14:24:14 +08:00
winlin
574ae58adc For #307, support mock server eip by API 2020-04-07 11:36:26 +08:00