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

2653 commits

Author SHA1 Message Date
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
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
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
b0208029bb RTC: Reuse UDP socket to receive packet. 4.0.67 2021-02-10 15:55:35 +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
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
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
a43f339aa6 Update server stat for cid 2021-02-07 21:33:24 +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
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
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
2b85ad1f60 RTC: Reuse UDP socket to receive packet. 4.0.67 2021-02-04 17:27:32 +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
d92bbe7558 RTC: Support eip with port 2021-01-31 18:07:43 +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
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
e5391ff93d RTC: Support eip with port 2021-01-30 21:36:17 +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
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
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
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
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