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

2543 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
winlin
57b5204a10 For #1998, Set default fmtp for H264 when transmux RTMP to RTC 2020-11-12 18:36:50 +08:00
winlin
32c1832d64 For #1657, refine code 2020-11-07 07:39:50 +08:00
winlin
385e055c7b For #1657, Fix read bug. 4.0.53 2020-11-06 21:55:17 +08:00
winlin
4618bfc137 For #1657, fix the http read bug 2020-11-06 21:15:19 +08:00
winlin
6dc9824495 For #1657, fix the http read bug 2020-11-06 20:45:44 +08:00
winlin
79655adea0 For #1657, fix the http read bug 2020-11-06 19:53:37 +08:00
winlin
c3f23f4c23 For #1657, fix the http read bug 2020-11-06 19:42:22 +08:00
winlin
a20f02ffe1 For #1657, Read cached data first in SSL. 4.0.48 2020-11-06 19:14:04 +08:00
winlin
30ba5a32ed For #1657, Support HTTPS Streaming 2020-11-06 17:22:23 +08:00
winlin
faf53927e8 For #1657, Fix utest fail 2020-11-06 15:24:37 +08:00
winlin
272ca9d0f6 For #1657, Support HTTPS API 2020-11-06 15:05:01 +08:00
winlin
7916214e27 For #1657, refine api for http 2020-11-06 09:51:04 +08:00
winlin
5782b45978 For #1657: Refine code 2020-11-05 21:44:47 +08:00
winlin
2fedb683e8 For #1657, refine code 2020-11-05 21:25:55 +08:00
winlin
c3d290013e For #1657, handle on_message_done 2020-11-05 18:34:56 +08:00
winlin
4b082ea96c For #1657, refine http api disconnect log 2020-11-05 18:19:43 +08:00
winlin
74799a31e3 For #1657, refine on_http_message with response writer 2020-11-05 18:08:13 +08:00
winlin
d67b050935 For #1657, fix the jsonp bug 2020-11-05 17:57:22 +08:00
winlin
fc21b31714 For #1657, refine the context for disposing 2020-11-05 17:16:59 +08:00
winlin
b492d59df0 For #1657: Refine code 2020-11-05 16:52:33 +08:00
winlin
0a3a38762a For #1657: Remove duplicated code, merge http api with conn 2020-11-05 16:46:16 +08:00
winlin
9cf4203201 For #1657: Refine code 2020-11-05 15:18:13 +08:00
winlin
24125b9770 For #1657: Refine connection arch, remove hierachy 2020-11-05 15:08:36 +08:00
winlin
2a14dc0ebd For #1657: Refine TCP connections arch 2020-11-05 12:25:54 +08:00
winlin
4ba66b388b For #1657: Refine TCP connections arch 2020-11-05 11:47:24 +08:00
winlin
3038dd473d For #1657, refine connection interface 2020-11-04 20:57:07 +08:00
winlin
0a82719bd3 Refine connection structure 2020-11-04 18:15:43 +08:00
winlin
d552a1a5fb For #1657, support HTTPS client, for http-callback. 4.0.45 2020-11-03 15:45:52 +08:00
winlin
a28f98581e Refine cid for source 2020-10-31 22:04:53 +08:00
winlin
365d3b8bda Merge SRS3.0 2020-10-31 21:53:15 +08:00
winlin
9a963c6fd2 Fix #509, Always malloc stack on heap. 3.0.153 2020-10-31 21:27:09 +08:00
winlin
8c1eca98b0 Merge SRS3.0 2020-10-31 19:25:56 +08:00
winlin
b348539687 Remove some global elements for debugging. 3.0.152 2020-10-31 17:53:00 +08:00
winlin
bf5e2add83 Refine source cid, track previous one. 3.0.150 2020-10-31 17:42:20 +08:00
winlin
adadbb7e9c Merge branch '3.0release' into 4.0release 2020-10-24 18:29:12 +08:00
winlin
8445d5543b Refine script and startup logs. 3.0.148 2020-10-24 18:28:53 +08:00
winlin
d5a0ad3dd8 RTC: Use FFmpeg to transcode aac to opus 2020-10-22 17:07:50 +08:00
winlin
97880f6bb7 ST: Allow set the default stack size 2020-10-22 17:06:36 +08:00
winlin
a14f26971b RTC: add comment for DTLS packet 2020-10-19 12:04:28 +08:00
winlin
ba6462aab4 RTC: Refine DTLS ARQ, use step interval 2020-10-03 21:34:34 +08:00
winlin
776f24cf3d Refine resource manager, ignore unsubscribed handler 2020-10-02 09:13:41 +08:00
chenhaibo
ba29095d10 RTC: fix memory leak bug 2020-09-30 11:16:37 +08:00
winlin
42a2dea5e0 Refine code 2020-09-30 11:14:49 +08:00
winlin
99d9d02579 RTC: Print server stats every 5s 2020-09-27 16:10:24 +08:00
winlin
4795244716 Fix stat get time bug 2020-09-27 14:57:18 +08:00
jinxue.cgh
dc3756b8b2 RTC: Compatible with SSRC without mslabel. 2020-09-23 19:59:35 +08:00
winlin
fb6c2fdf80 RTC: Use event notify for stream source 2020-09-23 19:29:19 +08:00
jinxue.cgh
2b47b42213 RTC: Refine PLI request log. 2020-09-21 17:03:48 +08:00
winlin
1a33452e95 Refine resource manager, fix loop and context switching bug 2020-09-20 22:09:03 +08:00
winlin
033e2f9210 Add utest for resource manager 2020-09-20 21:10:48 +08:00
winlin
7e3dfa7149 GB28181: Fix build fail 2020-09-20 18:01:03 +08:00
winlin
7c682a99c9 RTC: Set to alive when got any packet 2020-09-19 11:04:54 +08:00
winlin
8bf677e3c8 Refine code 2020-09-19 10:53:55 +08:00
winlin
1661876633 Fix build fail 2020-09-19 10:41:58 +08:00
winlin
64705d1cc8 RTC: Refine resouce management 2020-09-19 10:30:05 +08:00
winlin
1173d35e33 RTC: Add api in track 2020-09-17 17:15:59 +08:00
winlin
a19aa82029 RTC: Refine log 2020-09-17 16:34:10 +08:00
winlin
5b3f278243 RTC: Refine log 2020-09-17 16:25:24 +08:00
jinxue.cgh
27b85c7390 RTC: Fix clear zombie bug 2020-09-16 21:50:24 +08:00
winlin
2a3b5e5290 RTC: Fix mid generation bug 2020-09-16 19:59:49 +08:00
winlin
b4544acc11 Fix build fail 2020-09-16 19:56:06 +08:00
winlin
5ec5f98dcf RTC: Refine sdp for multiple streams 2020-09-16 19:41:34 +08:00
winlin
9f31506c83 Refine code 2020-09-15 12:34:00 +08:00
winlin
c26cb9a15b RTC: Support update msid for sdp 2020-09-15 12:31:36 +08:00
winlin
c8af9e9ec4 RTC: Use transformed mid, not the mid of track. 2020-09-15 12:12:46 +08:00
winlin
783029778c Merge branch 'develop' into feature/rtc 2020-09-14 20:55:30 +08:00
winlin
eea36bc261 Merge branch '4.0release' into develop 2020-09-14 20:52:45 +08:00
winlin
991ef94535 Merge branch '3.0release' into 4.0release 2020-09-14 20:52:11 +08:00
winlin
905444a1c7 For #1684, Prevent stop ingest for multiple times. 3.0.143 2020-09-14 20:48:44 +08:00
chenchengbin
0aecc063e0 防止ingester多次调用stop导致崩溃 2020-09-14 20:44:47 +08:00
winlin
69595089ee RTC: If not exists 42e01f, we pick up any profile such as 42001f. 2020-09-14 17:19:21 +08:00
winlin
dd7587c497 Dispose session when DTLS alert 2020-09-14 10:47:06 +08:00
winlin
72122c746a Fix utest build fail 2020-09-13 11:01:34 +08:00
winlin
962c379299 Fix build fail 2020-09-13 10:41:37 +08:00
winlin
66c680edb1 Refine code, use SrsConnectionManager 2020-09-11 18:55:18 +08:00
winlin
33f1cb87a2 Refine conneciton manager 2020-09-11 17:26:02 +08:00
winlin
4eae93d27b Rename SrsCoroutineManager to SrsConnectionManager 2020-09-11 17:20:41 +08:00
winlin
d8a158290f Remove unused conn from consumer. 2020-09-11 17:03:48 +08:00
winlin
88826aae8f Rename SrsConnection to SrsTcpConnection 2020-09-11 16:59:22 +08:00
winlin
2135b638b1 Merge srs_app_thread.hpp to srs_app_conn.hpp 2020-09-11 16:44:40 +08:00
winlin
60c759919f Refine code 2020-09-11 15:48:21 +08:00
winlin
c5f7a90a68 RTC: Fix bug 2020-09-10 17:49:10 +08:00
winlin
2b99b43633 RTC: Fix bug 2020-09-10 17:48:28 +08:00
winlin
e19631a2b7 RTC: Refine PLI request as worker 2020-09-10 17:45:19 +08:00
winlin
4c459a004e Log: Support tag for log 2020-09-10 11:07:21 +08:00