github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,694 Commits
14 Branches
107 Tags
372 MiB
develop
duiniuluantanqin-patch-1
5.0release
6.0release
4.0release
feature/simulcast
feature/gb28181
feature/h265
master
fossa
3.0release
2.0release
min
1.0release
v2.0-r2
v2.0-r1
v2.0-r0
v2.0-b4
v2.0-b3
v2.0-b2
v2.0-b1
v2.0-b0
v2.0-a3
v2.0-a2
v2.0-a1
v2.0-a0
v1.0-r4
v1.0-r3
v1.0-r2
v1.0-r1
v1.0-r0
v0.9.0
v0.8.0
v0.7.0
v0.6.0
v0.5.0
v0.4.0
v0.3.0
v0.2.0
v0.1.0
v2.0-r10
v2.0-r11
v2.0-r3
v2.0-r4
v2.0-r5
v2.0-r6
v2.0-r7
v2.0-r8
v2.0-r9
v3.0-a0
v3.0-a1
v3.0-a2
v3.0-a3
v3.0-a4
v3.0-a5
v3.0-a6
v3.0-a7
v3.0-a8
v3.0-a9
v3.0-b0
v3.0-b1
v3.0-b2
v3.0-b3
v3.0-b4
v3.0-r0
v3.0-r1
v3.0-r2
v3.0-r3
v3.0-r4
v3.0-r5
v3.0-r6
v3.0-r7
v3.0-r8
v4.0-b0
v4.0-b1
v4.0-b10
v4.0-b2
v4.0-b3
v4.0-b4
v4.0-b5
v4.0-b6
v4.0-b7
v4.0-b8
v4.0-b9
v4.0-r0
v4.0-r1
v4.0-r2
v4.0-r3
v4.0-r4
v4.0-r5
v5.0-a0
v5.0-a1
v5.0-a2
v5.0-a3
v5.0-a4
v5.0-a5
v5.0-b0
v5.0-b1
v5.0-b2
v5.0-b3
v5.0-b4
v5.0-b5
v5.0-b6
v5.0-b7
v5.0-r0
v5.0-r1
v5.0-r2
v5.0-r3
v6.0-a0
v6.0-a1
v6.0-d0
v6.0-d1
v6.0-d2
v6.0-d3
v6.0-d4
v6.0-d5
v6.0-d6
v6.0.10
v6.0.36
v6.0.45
v6.0.48
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd4d11c2c18'
${ noResults }
Commit Graph

5400 Commits (d4d11c2c188347271cefd8979a6541f83281e8fb)

Author SHA1 Message Date
winlin b9352eac0c RTC: Refine stat logs 4 years ago
winlin 09bd1b9faa RTC Stat the detail of send packets 4 years ago
winlin d92ceaca39 RTC: Stat the detail of received packets 4 years ago
winlin 6c24f2e353 Refine logs 4 years ago
winlin 2f1e8a6911 RTC: Refine logs 4 years ago
winlin 33f4e02072 RTC: Send NACK one by one to avoid packet freed by context switching 4 years ago
winlin e1a840772d RTC: Refine TWCC and RTCP timer to 100ms. 4 years ago
winlin 6d3aa2c426 Refine code. 4.0.74 4 years ago
winlin 3a83a74dfc Stat: Refine stat bug for timer 4 years ago
winlin 5b8eea8cc5 Stat: Fix build fail for stat of timer and dispose 4 years ago
winlin 941a9aaf7a Refine timer, 4.0.73 4 years ago
winlin 6bacccd1b8 Fix utest fail 4 years ago
xialixin@kanzhun.com fdaee20b81 For #2200, Enable RTC and FLV for GB28181 4 years ago
winlin 548fcd627b Config: Update config files, daemon off, log to console 4 years ago
winlin 61eeb781b7 Always link with pthread 4 years ago
winlin 1f621a6db3 Remove dead code: memory watch 4 years ago
winlin c6cb0fb21f Refine scripts 4 years ago
winlin 0fe031a156 Support to disable stats by default 4 years ago
winlin 7d75f0af0f Remove dead code 4 years ago
winlin 044df17791 Fix utest fail 4 years ago
winlin c5d2027f9a RTC: Support high performance timer about 25ms resolution. 4.0.72 4 years ago
winlin ebcba149ae For #2194, yield for timer, for rtc player 4 years ago
winlin df1eca10fb For #2194, yield for timer, for rtc publisher 4 years ago
winlin a049ce3fb7 For #2194, Core: Refine yield for high performance timer. 4 years ago
winlin a5a96491a3 For #2194, yield for timer, for live publisher 4 years ago
winlin d1bcc03d9a For #2194, yield for high performance timer, for live player 4 years ago
winlin c0fda42743 For #2194, Support ST yield 4 years ago
winlin b4b9776b02 Core: Support yield current coroutine for high performance timer. 4 years ago
winlin d8563398b2 Clock: Update stat. Insert timer to execute first 4 years ago
winlin f987198af0 Clock: Use one system wall clock 4 years ago
winlin 9db7126eb4 Core: Refine ST stat for thread switch 4 years ago
winlin 15f7fa2c36 Core: Refine ST stat for io events 4 years ago
winlin 12d7e57011 Core: Refine sched and clock stat 4 years ago
winlin c2332f9e55 Core: Use 20ms wall clock 4 years ago
winlin bddc787a16 Refine the pps. 4 years ago
winlin 70fb647ac9 Perf: Add stat for sched of ST. 4 years ago
winlin e91e0eaf46 Perf: Add stat for io of ST. 4 years ago
winlin b431ad738c RTC: Refine performance about 700+ streams. 4.0.71 4 years ago
winlin b7c7d6566f Fix build fail 4 years ago
winlin 2aa94c643c Refine server stat, extract to hybrid server stat 4 years ago
winlin 6b260d6021 Fix utest fail 4 years ago
winlin 7114682eec Timer: Apply timer(HourGlass) to server and sources 4 years ago
winlin 77cffd3e04 Main: Refine sever manager. 4 years ago
winlin f9bd84109b Timer: Refine the hour glass, support stop 4 years ago
winlin 4a37fe30c7 RTC: Refine RTP header, never extends from any class 4 years ago
winlin 6feaeace27 RTC: Send NACK by timer, no by RTP packet 4 years ago
winlin d2e728812b RTC: Send NACK by timer, no by RTP packet 4 years ago
winlin 5919865e5d RTC: Refine NACK check, interval, time 4 years ago
winlin 627688c582 RTC: Update stat for received nack 4 years ago
winlin 44c85cc3d2 RTC: Never copy the packet for hijack. 4 years ago
winlin 81db13f27f RTC: Update stat for nack 4 years ago
winlin 51e630d53c RTC: For RTP packet, never switch to context of session except error. 4 years ago
winlin 154ae9b4eb RTC: Update stat for twcc and rr 4 years ago
winlin 86d615f27e RTC: Print stat for pli and timer every 5s. 4.0.70 4 years ago
winlin 9a0e5bc979 RTC: Fix udp recvfrom bug 4 years ago
winlin ccb6c49029 RTC: Refine timer to 20ms, twcc to 40ms 4 years ago
winlin d069346f6b Update server stat for fast-id search 4 years ago
winlin 84afeaf433 Update server stat for fast-id search 4 years ago
winlin 44f5ca6a35 Update server stat for fast-id search 4 years ago
winlin 5ae47725e6 SRS: Refine the UDP address parsing, no string 4 years ago
winlin ca3ac467a3 RTC: Stat the UDP packets and addresses 4 years ago
winlin 2b73c1c7e6 RTC: Refine the UDP address parsing, no string 4 years ago
winlin 52609ea2f0 RTC: Use vector for fast search fast-id 4 years ago
winlin 7f4d8a40e9 RTC: Refine the SRTP protect api 4 years ago
winlin 2989e6c9c3 Fix build fail 4 years ago
winlin 949044d773 RTC: Refine SRTP unprotect rtp and rtcp, without copy 4 years ago
winlin aec27450e8 RTC: Refine unprotect_rtp to reuse cipher 4 years ago
winlin 719df6fa41 RTC: Parse TWCC SN fastly. 4 years ago
winlin 79a6907a65 RTC: Parse PT fast and refine udp handler. 4.0.69 4 years ago
winlin 826546d518 Refine pps add SrsPps 4 years ago
winlin c3414a30dc RTC: Refine UDP packet peer fast id. 4.0.68 4 years ago
winlin e95fd10462 RTC: Don't parse RTP header if no twcc 4 years ago
winlin 49a772770f Refine code 4 years ago
winlin fec088972d RTC: Fix bug for header parsing 4 years ago
winlin e17d20c8fa RTC: Refine static cast for RTC connection 4 years ago
winlin a5b21c159f RTC: Support disable nack 4 years ago
winlin 2b60112130 RTC: Support disable nack 4 years ago
winlin dffbebfe6f RTC: Fast parse ssrc and find the publisher 4 years ago
winlin 5f31868ce6 RTC: Refine publish stream by find publisher 4 years ago
winlin 6fa3b8212c Update ST doc 4 years ago
winlin 301904467a Update .gitignore 4 years ago
winlin b0208029bb RTC: Reuse UDP socket to receive packet. 4.0.67 4 years ago
winlin 9ada516e98 At least wait 1ms when <1ms, to avoid epoll_wait spin loop. 4.0.66 4 years ago
winlin 5eafcea895 RTC: Refine performance for UDP recv context id switch 4 years ago
winlin b7f5fa7c9d RTC: Fix NACK remove loop bug 4 years ago
winlin 4bcfce7ff1 RTC: Refine is_alive code 4 years ago
winlin aeca278de0 RTC: Refine log for twcc large timer 4 years ago
winlin 076182cde2 Pick from develop. 4.0.65 4 years ago
winlin d92bbe7558 RTC: Support eip with port 4 years ago
winlin 3fa767f3cc Build: Support --ssl-local to rebuild openssl even system exists 4 years ago
winlin cd83054759 ST: Update doc 4 years ago
winlin 09224ea7e0 ST: Update doc 4 years ago
winlin 6e3bd61599 Enable --nasm and --srtp-asm by default for performance. 4.0.64 4 years ago
winlin 945cf64024 Refine srs_player 4 years ago
winlin f006bf59b1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin 979bf86e8b Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin 5c41766b79 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin b373400257 RTC: Extract NACK handler from stream to track. 4 years ago
winlin 40ea0b67f9 RTC: Refine RTP packet decoder to track and stream 4 years ago
winlin 0fe85a295c Refine options with default value 4 years ago
winlin b9a5d4beb6 Refine options with default value 4 years ago
winlin 1615c3df6c RTC: Refine code 4 years ago
winlin ec2535b183 RTC: Refine code 4 years ago
winlin e26b685169 Refine script 4 years ago
winlin 4bb3ad5637 For #2142, Fix bug for fixing memory leak for bridger. 4.0.62 4 years ago
winlin 4e70bf5eaf For #2142, Fix memory leak for bridger of RTC source stream. 4.0.61 4 years ago
winlin 50bb9eb391 Revert "For #2142, RTC: Fix memory leak" 
This reverts commit 2492b726af.
 4 years ago
winlin ed32965aa4 Revert "Fix #2142, Async release bridger when unpublish. 4.0.60" 
This reverts commit 06adb9dc42.
 4 years ago
winlin 06adb9dc42 Fix #2142, Async release bridger when unpublish. 4.0.60 4 years ago
winlin 10ffb2da36 HTML5 video tag resolution adaptive. 4.0.59 4 years ago
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.
 4 years ago
winlin b6843428c6 Fix build warnings 4 years ago
winlin 81d78310a0 Fix build warnings 4 years ago
winlin 61f62ceec6 Fix build warnings 4 years ago
winlin 473942c6f6 Kernel: Add utest for srs_string_split 4 years ago
winlin 8580b1e5fb Merge branch '4.0release' into develop 4 years ago
winlin f8266fe3b7 Add usage for --cherrypy=on|off when configure 4 years ago
winlin bfa156247c Merge branch '4.0release' into develop 4 years ago
winlin 6c7ffdeedf Merge branch '3.0release' into 4.0release 4 years ago
winlin d520679547 Refine code for changing id of stat to string 4 years ago
winlin 4f013404e3 Refine stat id 4 years ago
winlin 1c41f5d796 Merge SRS3, change id of stat to string 4 years ago
winlin fb7c051833 Change id from int to string for the statistics. 3.0.157 4 years ago
johzzy 3c14a96bdd
fix: html5 video tag resolution adaptive. (#2128) 4 years ago
winlin 248085edfe For #2109, Add more utest for srs_string_split 4 years ago
winlin 2492b726af RTC: Fix memory leak 4 years ago
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>
 4 years ago
winlin 6cf93557e1 RTC: Fix publish RTC ssrc bug 4 years ago
winlin fbbdf5ba0e RTC: Fix audio track NULL bug 4 years ago
winlin 040893efde Add research for UDP binding 4 years ago
winlin 155587d2c1 RTC: Fix parse error stap playload crash bug 4 years ago
winlin ebe38f7337 RTC: Fix RTX bug 4 years ago
winlin 78fcaaf7b1 RTC: Fix memory leak 4 years ago
winlin 03389f5e8c Merge branch '4.0release' into develop 4 years ago
winlin 1df2ea5ca8 Merge branch '3.0release' into 4.0release 4 years ago
winlin 831c78062b Remove vhost in query if not present it 4 years ago
winlin 8fa093c53c Merge branch '4.0release' into develop 4 years ago
winlin 2538b02a9b Merge branch '3.0release' into 4.0release 4 years ago
winlin 6e43ef6866 For RTMP edge/forward, pass vhost in tcUrl, not in stream. 3.0.156 4 years ago
winlin f9444c376c Merge SRS4 4 years ago
winlin 0ccbd7c40a Support get schema for HTTP message 4 years ago
winlin af8bf67606 Refine player 4 years ago
winlin 92588c0872 Merge branch '4.0release' into develop 4 years ago
winlin 18d049accc Support disable CherryPy. 4.0.57 4 years ago
jinxue.cgh 7f081b4178 RTC: Refine TWCC from 200ms to 50ms 4 years ago
winlin c3938ddfd2 Research: Add cost analysis 4 years ago
winlin a4d1b3e2ca Research: Add cost analysis 4 years ago
winlin ec212b7413 Merge branch '4.0release' into develop 4 years ago
winlin 764909c6cf Clear disposing then free resources to avoid reuse addresses 4 years ago
winlin 6afdf3addf Merge branch '4.0release' into develop 4 years ago