Commit Graph

4179 Commits (d0c0f26160d1fb883f38c86546f16eb6a0617107)

Author SHA1 Message Date
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 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
winlin e8fa92e3d1 Refine logs for resource manager 4 years ago
winlin 5949eee4f4 Keep resources when dispoing to avoid reuse addresses. 4 years ago
winlin 9217fad73b Hotfix: Print resource address when manager dispose it 4 years ago
winlin 4d18835f3c Fix build fail 4 years ago
winlin 90b61ad952 Merge SRS4 4 years ago
winlin 5ebf034aea For #1694, Refine API for nb_bytes 4 years ago
winlin c17474627b Merge SRS3 4 years ago
winlin 25c76c1e8a Fix #1694, Support DVR 2GB+ MP4 file. 3.0.155 4 years ago
winlin 576be75f00 Merge branch '4.0release' into develop 4 years ago
winlin c97e943b07 Merge SRS3 4 years ago
winlin ab5ddd24e2 Fix #1548, Add edts in MP4 for Windows10. 3.0.154 4 years ago
winlin 721173e6af MP4: Fix warnings 4 years ago
winlin c7c6d8778a RTC: Fix warnings 4 years ago
jinxue.cgh 5309dbe18b RTC: Refine RTCP process 4 years ago
winlin 18ae8d8571 RTC: Fix SDP bug for firefox 4 years ago
winlin aad7c448bf For #1998, Support Firefox. 4 years ago
winlin 0c113ff084 For #1998, support firefox 4 years ago
winlin c5457e8241 RTC: Support unified-plan 4 years ago
winlin 27db60cc23 Fix #1996, Heap off-by-one in utest 4 years ago
winlin c796c0d093 Fix #1689, fix typo 4 years ago
莫战 b38f30c3ee support query parsing and escape 4 years ago
莫战 dc7124cd05 support base64 encode 4 years ago
jinxue.cgh 58b75c6f1b tfsfu: add play red pt negotiate 4 years ago
winlin 140f8b0fce For #1998, refine PT for firefox, support RED 4 years ago
PieerePi 3d5c18c25a
GB28181 code crashed in ffmpeg after commit "RTC: Use FFmpeg to transcode aac to opus" <d5a0ad3dd8>. (#2057)
Change the size from 64K to 256K.
4 years ago
Jesse Xi 8515f5a91e
incomplete_len 在大华摄像头下,因为大华包头对音频的不标准处理,可能为负值,而sizeof(SrsPsPacketStartCode) 返回的是unsigned 类型, 因些增加判断 (#2039)
Co-authored-by: jesse.xi <jj.xi@tianrang-inc.com>
4 years ago
winlin c779d95246 GB28181: Remove chinese comments. 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 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 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 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
winlin a28f98581e Refine cid for source 4 years ago
winlin 365d3b8bda Merge SRS3.0 4 years ago
winlin 9a963c6fd2 Fix #509, Always malloc stack on heap. 3.0.153 4 years ago
winlin 71c9732bff Support gdb/srs.py to stat coroutines. 4.0.44 4 years ago
winlin 8c1eca98b0 Merge SRS3.0 4 years ago
winlin 86f8cbb5eb Remove some global elements for debugging. 3.0.152 4 years ago
winlin b348539687 Remove some global elements for debugging. 3.0.152 4 years ago
winlin 9f9e3a5d42 Use global _srs_server for debugging. 3.0.151 4 years ago
winlin bf5e2add83 Refine source cid, track previous one. 3.0.150 4 years ago
winlin 07ecc25071 Merge branch '3.0release' into 4.0release 4 years ago
winlin 7b68330651 Add hls.realtime.conf for low-latency HLS. 3.0.149 4 years ago
winlin adadbb7e9c Merge branch '3.0release' into 4.0release 4 years ago
winlin 8445d5543b Refine script and startup logs. 3.0.148 4 years ago
winlin a51e275414 Merge SRS3 4 years ago
winlin 6dc3d85ded Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147 4 years ago
winlin be1a1d99de Merge SRS3 4 years ago
winlin e1ff69f292 Refine build script, use libssl in docker. 3.0.146 4 years ago
winlin d5a0ad3dd8 RTC: Use FFmpeg to transcode aac to opus 4 years ago
winlin 97880f6bb7 ST: Allow set the default stack size 4 years ago
winlin a14f26971b RTC: add comment for DTLS packet 4 years ago
winlin 07ea733901 Merge branch 'develop' into feature/rtc 4 years ago
winlin bce55d2789 Merge branch '4.0release' into develop 4 years ago
winlin 913d920ec5 Merge branch '3.0release' into 4.0release 4 years ago
winlin 3f3a23f978 Fix #1987, Fix Kbps resample bug. 3.0.145 4 years ago
winlin 9c11e5077f Fix Kbps resample bug 4 years ago
winlin b602aef56f Merge branch 'develop' into feature/rtc 4 years ago
winlin 39dc118c00 Merge branch '4.0release' into develop 4 years ago