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

258 commits

Author SHA1 Message Date
winlin
e27b658ef9 Refine the error for WebRTC H5 publisher. v4.0.239 2022-02-08 11:54:04 +08:00
winlin
73d0ce1cee Support api to specify the WebRTC API port. v4.0.225 2022-01-13 13:34:06 +08:00
winlin
c6c2e97189 Support api_port to specify the WebRTC API port. v4.0.225 2022-01-13 12:16:45 +08:00
winlin
db3ceb445b Support api_port to specify the WebRTC API port. v4.0.224 2022-01-13 12:07:34 +08:00
winlin
542a3e4f36 RTC: Refine publish security error message (#2762). v4.0.200 2021-12-01 08:27:13 +08:00
winlin
7771fbe858 Fix #2732: WebRTC: Fail to publish RTC automatically for HTML5. 2021-11-14 13:48:48 +08:00
winlin
10b9a81061 RTC: Support eip/candidate to set the eip of server 2021-07-08 14:25:38 +08:00
winlin
68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 2021-06-16 08:27:37 +08:00
winlin
3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 2021-05-31 12:59:21 +08:00
winlin
c353f1fe57 Update Usage 2021-05-26 14:21:23 +08:00
winlin
7ea05dddf2 RTC: Allow set constrain for publisher 2021-05-21 18:32:53 +08:00
winlin
9ed388523f RTC: Refine demo H5 page 2021-05-21 17:26:52 +08:00
winlin
37c9066636 RTC: Refine sdk, migrate from onaddstream to ontrack. 4.0.120 2021-05-21 16:58:21 +08:00
winlin
3bf1b0cb7d Refine tid for sdk and demos. 4.0.106 2021-05-09 22:33:43 +08:00
winlin
1e27db6a7d Update players 2021-05-05 12:53:26 +08:00
winlin
700186b1c8 Tools: Refine random room and display for demo 2021-05-04 11:20:10 +08:00
winlin
74043b4153 Tools: Update one to one demo 2021-05-03 14:13:32 +08:00
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
 2021-04-30 08:09:01 +08:00
winlin
51aa899358 RTC: Refine H5 demo, extract srs.sdk.js 2021-04-29 11:50:51 +08:00
winlin
7cae97e4d3 SquashSRS3: Update players 2021-04-28 15:45:34 +08:00
winlin
6f66cf0868 Player: Change the default from RTMP to HTTP-FLV. 2021-04-24 19:38:49 +08:00
xialixin@kanzhun.com
fdaee20b81 For #2200, Enable RTC and FLV for GB28181 2021-02-19 18:54:12 +08:00
winlin
945cf64024 Refine srs_player 2021-01-31 18:06:55 +08:00
winlin
f006bf59b1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:52 +08:00
winlin
979bf86e8b Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:49 +08:00
winlin
5c41766b79 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:46 +08:00
johzzy
3c14a96bdd
fix: html5 video tag resolution adaptive. (#2128) 2021-01-07 13:47:30 +08:00
winlin
f9444c376c Merge SRS4 2020-12-24 18:51:04 +08:00
winlin
af8bf67606 Refine player 2020-12-24 17:19:33 +08:00
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声明修改
 2020-11-15 23:14:34 +08:00
winlin
751dab56d8 RTC: Refine player and publisher 2020-11-15 16:48:30 +08:00
winlin
529264f238 RTC: Refine player and publisher 2020-11-15 15:46:24 +08:00
winlin
efca38cd89 Player: Change default HTTP-API port to 1985 for WebRTC 2020-11-10 18:07:15 +08:00
winlin
e085250245 Update players 2020-11-07 11:12:22 +08:00
winlin
08e19406ef Player: Refine code 2020-11-02 17:21:51 +08:00
winlin
534fcabbd5 Research: Update players 2020-10-30 11:18:08 +08:00
winlin
5e7fe096a9 Refine player pages 2020-10-28 10:48:48 +08:00
winlin
9ef8e1bd86 RTC: Refine js for player 2020-10-14 21:11:02 +08:00
winlin
72f87e7cbc RTC: Refine js for player 2020-10-14 20:33:39 +08:00
winlin
3eeeda6a12 Player: Remove jwplayer and osmf 2020-08-17 16:59:25 +08:00
winlin
c6a68234cb RTC: Fix publish page 2020-07-26 15:52:36 +08:00
winlin
9614af070c Support simulator link in DEMO page 2020-05-07 18:28:59 +08:00
winlin
d125116317 Support simulate NACK for RTC publisher 2020-05-04 17:49:39 +08:00
winlin
4d33070c59 Support NACK for RTC player 2020-05-04 14:47:58 +08:00
winlin
47df22df9e Refine RTC, no trickle for ice-lite, disable algorithms right-now 2020-05-03 20:19:45 +08:00
winlin
a812183144 Refactor the RTC sender audio queue 2020-05-03 14:28:51 +08:00
winlin
ef64c5e2bd Refine RTC, reject when config disabled. 2020-05-03 13:11:38 +08:00
winlin
e4329fd1a0 Refactor RTC, create source once 2020-04-26 19:00:36 +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