github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,221 Commits
14 Branches
107 Tags
373 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 'b009860b11'
${ noResults }
Commit Graph

654 Commits (b009860b11145e7f64e0a9aa50c3aa2f61195a53)

Author SHA1 Message Date
winlin f043a7eb48 SquashSRS4: Allow RTC play before publish. 4 years ago
winlin ef617b5fc6 Demo: Refine H5 demo page 4 years ago
winlin 442cf615c0 ST: Simplify it, only Linux/Darwin, epoll/kqueue, single process. 5.0.2 
commit f4872e528cad07f8ea683cc8cb26e34111bad1b5
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 09:13:21 2021 +0800

    ST: For #2188: Remove sendmmsg from ST.

commit aaeb8919bd4a026268e0600398cb1e9ad477663f
Author: winlin <winlin@vip.126.com>
Date:   Thu Mar 11 08:09:54 2021 +0800

    ST: Refine utest script.

commit d1ac9da53060b6bfa82b5d041da4c2ad9bd6b90a
Author: winlin <winlin@vip.126.com>
Date:   Wed Mar 3 11:02:25 2021 +0800

    ST: Support fast utest and coverage

commit 8400115b83c022e33f59422dbf6d85ee46fb9edb
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 07:02:19 2021 +0800

    ST: Always use unserialized accept for linux or darwin

commit c3686f2bca80d2c139239b08975575b1bb981ffa
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 06:54:05 2021 +0800

    ST: Refine ARFLAGS by disable the verbose log

commit aaa5c4f863eba278c4ed2b29a46297fb01a4ed63
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:58:46 2021 +0800

    ST: Stack always grows from top to down.

commit dddd466e5c2e418c6f4896cd8bf701130052b3d9
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:51:31 2021 +0800

    ST: Ignore process fork, for single process only

commit 7906cb5f6e78c916cb8b8d9522275bfc086bb6a3
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:50:59 2021 +0800

    ST: Fix build warnings

commit d94921b84a3b6cf88ace2c766cc2bfedb9c0602e
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 07:27:45 2021 +0800

    ST: Remove select and poll support, only epoll and kqueue

commit 76d202514615f78d1a8f2b15778f3dac5abf4abb
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 07:10:47 2021 +0800

    ST: Remove multiple OS support, except Linux and Darwin.

commit 13c4ba345c61170e86dde486a174378ca235f442
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 06:59:35 2021 +0800

    ST: Remove __ia64__ CPU support

commit 46c06e4a11879cfeb828382e44f11287782ce4b5
Author: winlin <winlin@vip.126.com>
Date:   Wed Feb 24 11:37:27 2021 +0800

    ST: Remove unused files for ST
 4 years ago
winlin eb339432c4 SquashSRS4: Update benchmark data. 4 years ago
winlin 3bf1b0cb7d Refine tid for sdk and demos. 4.0.106 4 years ago
winlin becbe45bcd SquashSRS4: Add demo for RTC 4 years ago
winlin 37f051f16d Update console 4 years ago
winlin 1e27db6a7d Update players 4 years ago
winlin 700186b1c8 Tools: Refine random room and display for demo 4 years ago
winlin 74043b4153 Tools: Update one to one demo 4 years ago
winlin 0b62216999 SquashSRS4: Support av1 for Chrome M90 enabled it. 4 years ago
Winlin e8fe66e3ba
RTC: Support av1 for Chrome M90 enabled it. 4.0.91 (#2324) 
* RTC: Support av1 for Chrome M90 enabled it. 4.0.91

* RTC: Show codec for WebRTC publisher
 4 years ago
winlin 51aa899358 RTC: Refine H5 demo, extract srs.sdk.js 4 years ago
winlin 7cae97e4d3 SquashSRS3: Update players 4 years ago
winlin 3d74b0efc9 SquashSRS4: Add crossdomain.xml for install script. 4 years ago
winlin db37a4ac02 SquashSRS3: Add crossdomain.xml for install script. 4 years ago
winlin d4a8a72388 SquashSRS4: Add console. Disable cherrypy by default. 4 years ago
winlin 6f66cf0868 Player: Change the default from RTMP to HTTP-FLV. 4 years ago
winlin de1c7522f0 SquashSRS3: Add console 4 years ago
winlin 1ee77614fb Refine comments 4 years ago
winlin fe1b427462 Update 4 years ago
xialixin@kanzhun.com fdaee20b81 For #2200, Enable RTC and FLV for GB28181 4 years ago
winlin d8563398b2 Clock: Update stat. Insert timer to execute first 4 years ago
xialixin@kanzhun.com 4df6fa540f For #2200, Enable RTC and FLV for GB28181 4 years ago
winlin 321f555e30 Clock: Update stat. Insert timer to execute first 4 years ago
winlin f3806126c4 Research: Add udp connect 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 0848574902 Research: Add c++11 thread-local 4 years ago
winlin 10205e8cc1 Refine srs_player 4 years ago
winlin 4514947e67 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin f01da568cb Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin 618333cdd1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
johzzy 3c14a96bdd
fix: html5 video tag resolution adaptive. (#2128) 4 years ago
winlin 040893efde Add research for UDP binding 4 years ago
winlin f9444c376c Merge SRS4 4 years ago
winlin af8bf67606 Refine player 4 years ago
winlin 92588c0872 Merge branch '4.0release' into develop 4 years ago
winlin c3938ddfd2 Research: Add cost analysis 4 years ago
winlin a4d1b3e2ca Research: Add cost analysis 4 years ago
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声明修改
 4 years ago
winlin 751dab56d8 RTC: Refine player and publisher 4 years ago
winlin 529264f238 RTC: Refine player and publisher 4 years ago
winlin efca38cd89 Player: Change default HTTP-API port to 1985 for WebRTC 4 years ago
winlin e085250245 Update players 4 years ago
winlin 08e19406ef Player: Refine code 4 years ago
winlin e71d770a26 Update 4 years ago
winlin e830ca7d0c Research: Add huge coroutine test program 4 years ago
winlin ae56293b27 Research: Add simple ST 4 years ago
winlin 941fdebd24 Research: Add mmap demo 4 years ago
winlin 534fcabbd5 Research: Update players 4 years ago
winlin 44e550e523 Research: Add badalloc 4 years ago
winlin a42da57448 Refine comments 4 years ago
winlin a7961e558b Research: Learn about the function call 4 years ago
winlin 5e7fe096a9 Refine player pages 4 years ago
winlin 9ef8e1bd86 RTC: Refine js for player 4 years ago
winlin 72f87e7cbc RTC: Refine js for player 4 years ago
winlin 3eeeda6a12 Player: Remove jwplayer and osmf 5 years ago
winlin c6a68234cb RTC: Fix publish page 5 years ago
winlin 812403a44d Remove srslibrtmp 5 years ago
winlin 9614af070c Support simulator link in DEMO page 5 years ago
winlin d125116317 Support simulate NACK for RTC publisher 5 years ago
winlin 4d33070c59 Support NACK for RTC player 5 years ago
winlin 47df22df9e Refine RTC, no trickle for ice-lite, disable algorithms right-now 5 years ago
winlin a812183144 Refactor the RTC sender audio queue 5 years ago
winlin ef64c5e2bd Refine RTC, reject when config disabled. 5 years ago
winlin e4329fd1a0 Refactor RTC, create source once 5 years ago
winlin ebdc03416a Free rtc publish. Refactor TAB to spaces 5 years ago
winlin cd3c15ec4e Support RTC publisher. 5 years ago
xiaozhihong bb9367f88a add rtc_publisher.html 5 years ago
winlin dabad68f48 Merge branch 'feature/gb28181' into develop 5 years ago
winlin 7bec73f224 Refactor demo pages. 5 years ago
kyxlx550 904ce2452b update srs gb28281 web demo 5 years ago
winlin 0fe9d9e324 Add UDP ZeroCopy research 5 years ago
kyxlx550 6a070a9a64 support sip ptz cmd 5 years ago
winlin 74416e476a Refine research zerocopy, use batch for reception 5 years ago
winlin 72322836c6 Update demo for zerocopy 5 years ago
winlin a3de167bc7 For zerocopy research, support delay in server 5 years ago
winlin 8f9cc38f68 Refine zero copy research 5 years ago
winlin 2e9a561acf Update research zerocopy 5 years ago
winlin c362bfc3ab Add msg zerocopy research code 5 years ago
winlin a579f51e72 Remove ST in research 5 years ago
kyxlx550 06412ddddc fix gb28281 html ret error show 5 years ago
kyxlx550 b391ed6206 fix gb28281 html rtc player stop 5 years ago
kyxlx550 7950bc586e add gb28281 demo html 5 years ago
winlin 8d5f91f777 For rtc player, use target to overwrite server, vhost and eip. 5 years ago
winlin 574ae58adc For #307, support mock server eip by API 5 years ago
xiaozhihong 9dadcdffd6 Merge remote-tracking branch 'upstream/feature/rtc' into sdp 5 years ago
xiaozhihong 49da2099c1 sdp exchange. 5 years ago
winlin 57c23d93c1 Refactor url for rtc player 5 years ago
winlin 4c63319b5d Release rtc_player to ossrs.net 5 years ago
winlin 8a7f35dc6d Release rtc_player to ossrs.net 5 years ago
winlin 6edca6147c Release rtc_player to ossrs.net 5 years ago
winlin f8b4ba1e5a Release rtc_player to ossrs.net 5 years ago
winlin 98d372bd40 Release rtc_player to ossrs.net 5 years ago
winlin 3360db7b77 Refactor api, follow https://github.com/rtcdn/rtcdn-draft 5 years ago
winlin 532750f18a Refactor api data, url to api 5 years ago
winlin 979d7c3f4f For #1638, #307, refactor rtc player. 5 years ago