1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

4635 commits

Author SHA1 Message Date
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