winlin
|
fa3c491c0b
|
For #2014, Merged.
|
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 |
yinjiaoyuan
|
fe65c7bf84
|
For 2034, GB28181: Support transport over TCP
|
4 years ago |
winlin
|
751dab56d8
|
RTC: Refine player and publisher
|
4 years ago |
winlin
|
529264f238
|
RTC: Refine player and publisher
|
4 years ago |
winlin
|
3cf3047f97
|
Add conf/rtc_live.conf
|
4 years ago |
winlin
|
7521bc86ad
|
For #1998, Update conf
|
4 years ago |
winlin
|
7136af21de
|
For #1998, TODO: FIME: Should check packetization-mode=1 also.
|
4 years ago |
winlin
|
5d27c62e95
|
For #1998, fix fetch remote payload bug. 4.0.56
|
4 years ago |
winlin
|
4650d47082
|
For #1998, Support Firefox, use PT in offer. 4.0.55
|
4 years ago |
winlin
|
57b5204a10
|
For #1998, Set default fmtp for H264 when transmux RTMP to RTC
|
4 years ago |
winlin
|
9908433bc8
|
For #1508, Transform http header name to upper camel case. 4.0.54
|
4 years ago |
winlin
|
07c04a042a
|
URI: Refine uri parser
|
4 years ago |
winlin
|
efca38cd89
|
Player: Change default HTTP-API port to 1985 for WebRTC
|
4 years ago |
winlin
|
cb4c668249
|
Merge SRS3
|
4 years ago |
winlin
|
6e922b9589
|
Refine README for SRS3
|
4 years ago |
winlin
|
e085250245
|
Update players
|
4 years ago |
winlin
|
32c1832d64
|
For #1657, refine code
|
4 years ago |
winlin
|
5709ee1b63
|
For #1657, add https configs
|
4 years ago |
winlin
|
385e055c7b
|
For #1657, Fix read bug. 4.0.53
|
4 years ago |
winlin
|
4618bfc137
|
For #1657, fix the http read bug
|
4 years ago |
winlin
|
6dc9824495
|
For #1657, fix the http read bug
|
4 years ago |
winlin
|
79655adea0
|
For #1657, fix the http read bug
|
4 years ago |
winlin
|
c3f23f4c23
|
For #1657, fix the http read bug
|
4 years ago |
winlin
|
c5be7ce8f4
|
For #1657, Update readme
|
4 years ago |
winlin
|
a20f02ffe1
|
For #1657, Read cached data first in SSL. 4.0.48
|
4 years ago |
winlin
|
a49b2d7b0e
|
For #1657, Support HTTPS Callback, HTTPS API, HTTPS FLV, etc. 4.0.47
|
4 years ago |
winlin
|
30ba5a32ed
|
For #1657, Support HTTPS Streaming
|
4 years ago |
winlin
|
faf53927e8
|
For #1657, Fix utest fail
|
4 years ago |
winlin
|
272ca9d0f6
|
For #1657, Support HTTPS API
|
4 years ago |
winlin
|
7916214e27
|
For #1657, refine api for http
|
4 years ago |
winlin
|
5782b45978
|
For #1657: Refine code
|
4 years ago |
winlin
|
2fedb683e8
|
For #1657, refine code
|
4 years ago |
winlin
|
c3d290013e
|
For #1657, handle on_message_done
|
4 years ago |
winlin
|
4b082ea96c
|
For #1657, refine http api disconnect log
|
4 years ago |
winlin
|
74799a31e3
|
For #1657, refine on_http_message with response writer
|
4 years ago |
winlin
|
d67b050935
|
For #1657, fix the jsonp bug
|
4 years ago |
winlin
|
fc21b31714
|
For #1657, refine the context for disposing
|
4 years ago |
winlin
|
b492d59df0
|
For #1657: Refine code
|
4 years ago |
winlin
|
0a3a38762a
|
For #1657: Remove duplicated code, merge http api with conn
|
4 years ago |
winlin
|
9cf4203201
|
For #1657: Refine code
|
4 years ago |
winlin
|
24125b9770
|
For #1657: Refine connection arch, remove hierachy
|
4 years ago |
winlin
|
2a14dc0ebd
|
For #1657: Refine TCP connections arch
|
4 years ago |
winlin
|
4ba66b388b
|
For #1657: Refine TCP connections arch
|
4 years ago |
winlin
|
3038dd473d
|
For #1657, refine connection interface
|
4 years ago |
winlin
|
0a82719bd3
|
Refine connection structure
|
4 years ago |
winlin
|
7c68487bf7
|
For #1657, Fix utest fail
|
4 years ago |
winlin
|
d2df045d0e
|
For #1657, enable HTTPS by default
|
4 years ago |
winlin
|
5577d19b61
|
For #1657, Refine https-client code
|
4 years ago |
winlin
|
d552a1a5fb
|
For #1657, support HTTPS client, for http-callback. 4.0.45
|
4 years ago |