external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity
6536 commits 14 branches 107 tags 377 MiB
Commit graph

4192 commits

Author SHA1 Message Date
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
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
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
f6720c18c6 Enable --nasm and --srtp-asm by default for performance. 4.0.64 2021-01-25 22:23:42 +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
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
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
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