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
7122 commits 14 branches 107 tags 377 MiB
Commit graph

475 commits

Author SHA1 Message Date
winlin
92d95a500f Merge branch '4.0release' into merge/develop 2021-05-08 11:32:51 +08:00
winlin
b1e85664a1 Refine init of global SrsPps 2021-05-08 11:11:13 +08:00
winlin
56446825dc Merge branch '4.0release' into merge/develop 2021-04-20 19:02:17 +08:00
winlin
cec0191b16 Happy 2021 2021-04-20 19:00:14 +08:00
winlin
2ea19a20dd Merge 4.0 2021-04-16 09:28:53 +08:00
winlin
d01e603b25 Happy 2021 2021-04-16 09:25:55 +08:00
winlin
4f1d213c91 Live: Support follow HTTP/302 for HTTP/HTTPS FLV edge. 2021-03-17 16:53:39 +08:00
winlin
35431749c4 Live: Support follow client protocol for edge. 2021-03-17 16:48:18 +08:00
winlin
cec588e08a For #2188: Remove sendmmsg from ST. 2021-03-02 19:31:33 +08:00
winlin
6dac180627 Kernel: Never depends on another globals for global variables 2021-03-02 19:30:56 +08:00
winlin
d8ba72fdc5 Kernel: Extract SrsPps to kernel 2021-03-02 19:30:52 +08:00
winlin
34dae0fe0d For #2188: Remove sendmmsg from ST. 2021-02-26 09:13:21 +08:00
winlin
1909cfb3ff Kernel: Never depends on another globals for global variables 2021-02-25 14:06:18 +08:00
winlin
20df644a05 Kernel: Extract SrsPps to kernel 2021-02-25 13:46:52 +08:00
winlin
5b8eea8cc5 Stat: Fix build fail for stat of timer and dispose 2021-02-19 19:08:16 +08:00
xialixin@kanzhun.com
fdaee20b81 For #2200, Enable RTC and FLV for GB28181 2021-02-19 18:54:12 +08:00
winlin
c0fda42743 For #2194, Support ST yield 2021-02-19 18:53:08 +08:00
winlin
d8563398b2 Clock: Update stat. Insert timer to execute first 2021-02-19 18:53:02 +08:00
winlin
bddc787a16 Refine the pps. 2021-02-19 18:52:35 +08:00
winlin
181c9f25ed Live: Support connect origin by HTTP-FLV/HTTPS-FLV 2021-02-19 18:16:05 +08:00
xialixin@kanzhun.com
4df6fa540f For #2200, Enable RTC and FLV for GB28181 2021-02-18 21:51:49 +08:00
winlin
76d6449317 For #2194, Support ST yield 2021-02-11 21:14:45 +08:00
winlin
321f555e30 Clock: Update stat. Insert timer to execute first 2021-02-11 17:34:03 +08:00
winlin
99b4866717 Refine the pps. 2021-02-10 21:20:49 +08:00
winlin
77cffd3e04 Main: Refine sever manager. 2021-02-10 16:16:56 +08:00
winlin
826546d518 Refine pps add SrsPps 2021-02-10 15:57:29 +08:00
winlin
ee1d06c613 Main: Refine sever manager. 2021-02-09 12:44:56 +08:00
winlin
b4282a6ee1 Fix build fail 2021-02-07 21:39:09 +08:00
winlin
a43f339aa6 Update server stat for cid 2021-02-07 21:33:24 +08:00
winlin
102434b3d5 Context: Use key of thread to store context 2021-02-07 21:31:39 +08:00
winlin
668f8cbf6c Refine pps add SrsPps 2021-02-06 18:05:04 +08:00
winlin
bfa156247c Merge branch '4.0release' into develop 2021-01-07 17:47:54 +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
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
winlin
f9444c376c Merge SRS4 2020-12-24 18:51:04 +08:00
winlin
0ccbd7c40a Support get schema for HTTP message 2020-12-24 18:49:56 +08:00
winlin
c7c6d8778a RTC: Fix warnings 2020-12-08 16:59:43 +08:00
莫战
b38f30c3ee support query parsing and escape 2020-12-01 16:27:37 +08:00
winlin
c779d95246 GB28181: Remove chinese comments. 2020-11-16 00:06:03 +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
yinjiaoyuan
fe65c7bf84 For 2034, GB28181: Support transport over TCP 2020-11-15 22:50:59 +08:00
winlin
9908433bc8 For #1508, Transform http header name to upper camel case. 4.0.54 2020-11-11 16:38:05 +08:00
winlin
07c04a042a URI: Refine uri parser 2020-11-10 18:51:21 +08:00
winlin
5709ee1b63 For #1657, add https configs 2020-11-07 07:11:57 +08:00