winlin
|
c3938ddfd2
|
Research: Add cost analysis
|
2020-12-22 19:24:35 +08:00 |
|
winlin
|
a4d1b3e2ca
|
Research: Add cost analysis
|
2020-12-22 17:36:18 +08:00 |
|
winlin
|
ec212b7413
|
Merge branch '4.0release' into develop
|
2020-12-21 12:06:25 +08:00 |
|
winlin
|
764909c6cf
|
Clear disposing then free resources to avoid reuse addresses
|
2020-12-21 12:05:56 +08:00 |
|
winlin
|
6afdf3addf
|
Merge branch '4.0release' into develop
|
2020-12-21 12:00:03 +08:00 |
|
winlin
|
e8fa92e3d1
|
Refine logs for resource manager
|
2020-12-21 11:59:35 +08:00 |
|
winlin
|
5949eee4f4
|
Keep resources when dispoing to avoid reuse addresses.
|
2020-12-21 11:56:22 +08:00 |
|
winlin
|
9217fad73b
|
Hotfix: Print resource address when manager dispose it
|
2020-12-21 11:28:58 +08:00 |
|
winlin
|
868ee4e443
|
Merge branch '4.0release' into develop
|
2020-12-21 10:40:46 +08:00 |
|
winlin
|
39c7151da7
|
Merge branch '3.0release' into 4.0release
|
2020-12-21 10:40:27 +08:00 |
|
winlin
|
4d18835f3c
|
Fix build fail
|
2020-12-21 10:37:33 +08:00 |
|
winlin
|
90b61ad952
|
Merge SRS4
|
2020-12-18 10:14:26 +08:00 |
|
winlin
|
5ebf034aea
|
For #1694, Refine API for nb_bytes
|
2020-12-18 09:56:40 +08:00 |
|
winlin
|
c17474627b
|
Merge SRS3
|
2020-12-18 09:34:32 +08:00 |
|
winlin
|
25c76c1e8a
|
Fix #1694, Support DVR 2GB+ MP4 file. 3.0.155
|
2020-12-17 18:43:45 +08:00 |
|
winlin
|
576be75f00
|
Merge branch '4.0release' into develop
|
2020-12-17 12:28:04 +08:00 |
|
winlin
|
c97e943b07
|
Merge SRS3
|
2020-12-17 12:27:47 +08:00 |
|
winlin
|
ab5ddd24e2
|
Fix #1548, Add edts in MP4 for Windows10. 3.0.154
|
2020-12-17 12:07:34 +08:00 |
|
winlin
|
721173e6af
|
MP4: Fix warnings
|
2020-12-17 11:25:51 +08:00 |
|
winlin
|
1502560bcf
|
Update conf
|
2020-12-13 13:29:30 +08:00 |
|
winlin
|
9caeb606bf
|
ST: Support show coroutines.
|
2020-12-10 11:36:24 +08:00 |
|
winlin
|
c7c6d8778a
|
RTC: Fix warnings
|
2020-12-08 16:59:43 +08:00 |
|
jinxue.cgh
|
5309dbe18b
|
RTC: Refine RTCP process
|
2020-12-07 21:40:51 +08:00 |
|
winlin
|
18ae8d8571
|
RTC: Fix SDP bug for firefox
|
2020-12-03 10:58:46 +08:00 |
|
winlin
|
aad7c448bf
|
For #1998, Support Firefox.
|
2020-12-02 18:23:57 +08:00 |
|
winlin
|
0c113ff084
|
For #1998, support firefox
|
2020-12-02 17:29:05 +08:00 |
|
winlin
|
c5457e8241
|
RTC: Support unified-plan
|
2020-12-02 12:54:29 +08:00 |
|
winlin
|
27db60cc23
|
Fix #1996, Heap off-by-one in utest
|
2020-12-01 19:49:15 +08:00 |
|
winlin
|
c796c0d093
|
Fix #1689, fix typo
|
2020-12-01 17:05:47 +08:00 |
|
莫战
|
b38f30c3ee
|
support query parsing and escape
|
2020-12-01 16:27:37 +08:00 |
|
莫战
|
dc7124cd05
|
support base64 encode
|
2020-12-01 16:04:55 +08:00 |
|
jinxue.cgh
|
58b75c6f1b
|
tfsfu: add play red pt negotiate
|
2020-12-01 13:37:42 +08:00 |
|
winlin
|
140f8b0fce
|
For #1998, refine PT for firefox, support RED
|
2020-12-01 13:25:53 +08:00 |
|
winlin
|
f47329a94c
|
Update authors, for #2042, #2057
|
2020-11-30 11:04:02 +08:00 |
|
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.
|
2020-11-30 11:02:30 +08:00 |
|
ghostsf
|
d3e153e504
|
fix: update CMakeLists.txt for rtc (#2042)
|
2020-11-25 11:22:32 +08:00 |
|
winlin
|
d66082320f
|
For #2039, update authors
|
2020-11-17 16:53:05 +08:00 |
|
Jesse Xi
|
8515f5a91e
|
incomplete_len 在大华摄像头下，因为大华包头对音频的不标准处理，可能为负值，而sizeof(SrsPsPacketStartCode) 返回的是unsigned 类型， 因些增加判断 (#2039)
Co-authored-by: jesse.xi <jj.xi@tianrang-inc.com>
|
2020-11-17 16:44:37 +08:00 |
|
winlin
|
c779d95246
|
GB28181: Remove chinese comments.
|
2020-11-16 00:06:03 +08:00 |
|
winlin
|
977e027d86
|
SIP: Fix build fail for Mac
|
2020-11-15 23:47:00 +08:00 |
|
winlin
|
fa3c491c0b
|
For #2014, Merged.
|
2020-11-15 23:16:55 +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
|
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
|
3cf3047f97
|
Add conf/rtc_live.conf
|
2020-11-14 18:56:49 +08:00 |
|
winlin
|
7521bc86ad
|
For #1998, Update conf
|
2020-11-13 09:28:24 +08:00 |
|
winlin
|
7136af21de
|
For #1998, TODO: FIME: Should check packetization-mode=1 also.
|
2020-11-13 08:49:21 +08:00 |
|
winlin
|
5d27c62e95
|
For #1998, fix fetch remote payload bug. 4.0.56
|
2020-11-13 08:48:51 +08:00 |
|
winlin
|
4650d47082
|
For #1998, Support Firefox, use PT in offer. 4.0.55
|
2020-11-12 18:38:30 +08:00 |
|