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

685 commits

Author SHA1 Message Date
winlin
1ee77614fb Refine comments 2021-04-05 12:14:26 +08:00
winlin
fe1b427462 Update 2021-03-06 10:46:07 +08:00
xialixin@kanzhun.com
fdaee20b81 For #2200, Enable RTC and FLV for GB28181 2021-02-19 18:54:12 +08:00
winlin
d8563398b2 Clock: Update stat. Insert timer to execute first 2021-02-19 18:53:02 +08:00
xialixin@kanzhun.com
4df6fa540f For #2200, Enable RTC and FLV for GB28181 2021-02-18 21:51:49 +08:00
winlin
321f555e30 Clock: Update stat. Insert timer to execute first 2021-02-11 17:34:03 +08:00
winlin
f3806126c4 Research: Add udp connect 2021-02-05 11:07:53 +08:00
winlin
945cf64024 Refine srs_player 2021-01-31 18:06:55 +08:00
winlin
f006bf59b1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:52 +08:00
winlin
979bf86e8b Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:49 +08:00
winlin
5c41766b79 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:46 +08:00
winlin
0848574902 Research: Add c++11 thread-local 2021-01-31 17:27:47 +08:00
winlin
10205e8cc1 Refine srs_player 2021-01-20 21:06:57 +08:00
winlin
4514947e67 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-20 20:47:57 +08:00
winlin
f01da568cb Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-20 20:36:30 +08:00
winlin
618333cdd1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-20 18:59:14 +08:00
johzzy
3c14a96bdd
fix: html5 video tag resolution adaptive. (#2128) 2021-01-07 13:47:30 +08:00
winlin
040893efde Add research for UDP binding 2021-01-05 18:30:39 +08:00
winlin
f9444c376c Merge SRS4 2020-12-24 18:51:04 +08:00
winlin
af8bf67606 Refine player 2020-12-24 17:19:33 +08:00
winlin
92588c0872 Merge branch '4.0release' into develop 2020-12-24 11:34:17 +08:00
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
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
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
efca38cd89 Player: Change default HTTP-API port to 1985 for WebRTC 2020-11-10 18:07:15 +08:00
winlin
e085250245 Update players 2020-11-07 11:12:22 +08:00
winlin
08e19406ef Player: Refine code 2020-11-02 17:21:51 +08:00
winlin
e71d770a26 Update 2020-10-31 21:19:41 +08:00
winlin
e830ca7d0c Research: Add huge coroutine test program 2020-10-31 21:00:09 +08:00
winlin
ae56293b27 Research: Add simple ST 2020-10-31 11:30:58 +08:00
winlin
941fdebd24 Research: Add mmap demo 2020-10-30 17:49:07 +08:00
winlin
534fcabbd5 Research: Update players 2020-10-30 11:18:08 +08:00
winlin
44e550e523 Research: Add badalloc 2020-10-29 14:52:53 +08:00
winlin
a42da57448 Refine comments 2020-10-29 12:27:44 +08:00
winlin
a7961e558b Research: Learn about the function call 2020-10-29 12:02:33 +08:00
winlin
5e7fe096a9 Refine player pages 2020-10-28 10:48:48 +08:00
winlin
9ef8e1bd86 RTC: Refine js for player 2020-10-14 21:11:02 +08:00
winlin
72f87e7cbc RTC: Refine js for player 2020-10-14 20:33:39 +08:00
winlin
3eeeda6a12 Player: Remove jwplayer and osmf 2020-08-17 16:59:25 +08:00
winlin
c6a68234cb RTC: Fix publish page 2020-07-26 15:52:36 +08:00
winlin
812403a44d Remove srslibrtmp 2020-06-03 17:32:55 +08:00
winlin
9614af070c Support simulator link in DEMO page 2020-05-07 18:28:59 +08:00
winlin
d125116317 Support simulate NACK for RTC publisher 2020-05-04 17:49:39 +08:00
winlin
4d33070c59 Support NACK for RTC player 2020-05-04 14:47:58 +08:00
winlin
47df22df9e Refine RTC, no trickle for ice-lite, disable algorithms right-now 2020-05-03 20:19:45 +08:00
winlin
a812183144 Refactor the RTC sender audio queue 2020-05-03 14:28:51 +08:00
winlin
ef64c5e2bd Refine RTC, reject when config disabled. 2020-05-03 13:11:38 +08:00
winlin
e4329fd1a0 Refactor RTC, create source once 2020-04-26 19:00:36 +08:00
winlin
ebdc03416a Free rtc publish. Refactor TAB to spaces 2020-04-25 22:30:55 +08:00
winlin
cd3c15ec4e Support RTC publisher. 2020-04-25 20:32:37 +08:00
xiaozhihong
bb9367f88a add rtc_publisher.html 2020-04-24 16:22:08 +08:00
winlin
dabad68f48 Merge branch 'feature/gb28181' into develop 2020-04-21 15:27:40 +08:00
winlin
7bec73f224 Refactor demo pages. 2020-04-21 15:13:46 +08:00
kyxlx550
904ce2452b update srs gb28281 web demo 2020-04-21 12:53:52 +08:00
winlin
0fe9d9e324 Add UDP ZeroCopy research 2020-04-21 12:12:32 +08:00
kyxlx550
6a070a9a64 support sip ptz cmd 2020-04-20 21:34:18 +08:00
winlin
74416e476a Refine research zerocopy, use batch for reception 2020-04-20 21:18:49 +08:00
winlin
72322836c6 Update demo for zerocopy 2020-04-20 20:25:23 +08:00
winlin
a3de167bc7 For zerocopy research, support delay in server 2020-04-20 08:42:53 +08:00
winlin
8f9cc38f68 Refine zero copy research 2020-04-20 08:02:53 +08:00
winlin
2e9a561acf Update research zerocopy 2020-04-19 22:16:54 +08:00
winlin
c362bfc3ab Add msg zerocopy research code 2020-04-19 21:58:39 +08:00
winlin
a579f51e72 Remove ST in research 2020-04-19 20:51:39 +08:00
kyxlx550
06412ddddc fix gb28281 html ret error show 2020-04-16 18:33:43 +08:00
kyxlx550
b391ed6206 fix gb28281 html rtc player stop 2020-04-16 13:08:42 +08:00
kyxlx550
7950bc586e add gb28281 demo html 2020-04-15 22:05:32 +08:00
winlin
8d5f91f777 For rtc player, use target to overwrite server, vhost and eip. 2020-04-14 18:15:07 +08:00
winlin
574ae58adc For #307, support mock server eip by API 2020-04-07 11:36:26 +08:00
xiaozhihong
9dadcdffd6 Merge remote-tracking branch 'upstream/feature/rtc' into sdp 2020-03-30 15:16:44 +08:00
xiaozhihong
49da2099c1 sdp exchange. 2020-03-30 15:16:29 +08:00
winlin
57c23d93c1 Refactor url for rtc player 2020-03-23 13:36:17 +08:00
winlin
4c63319b5d Release rtc_player to ossrs.net 2020-03-23 10:36:15 +08:00
winlin
8a7f35dc6d Release rtc_player to ossrs.net 2020-03-22 22:52:51 +08:00
winlin
6edca6147c Release rtc_player to ossrs.net 2020-03-22 22:51:09 +08:00
winlin
f8b4ba1e5a Release rtc_player to ossrs.net 2020-03-22 22:48:51 +08:00
winlin
98d372bd40 Release rtc_player to ossrs.net 2020-03-22 21:54:18 +08:00
winlin
3360db7b77 Refactor api, follow https://github.com/rtcdn/rtcdn-draft 2020-03-21 17:56:26 +08:00
winlin
532750f18a Refactor api data, url to api 2020-03-21 17:33:54 +08:00
winlin
979d7c3f4f For #1638, #307, refactor rtc player. 2020-03-18 17:21:50 +08:00
winlin
c210c0b2f5 For #1638, #307, refactor rtc player. 2020-03-18 10:03:20 +08:00
winlin
4b23d04635 For #1638, #307, fix rtc player demo bug 2020-03-14 23:22:25 +08:00
winlin
c2916acd92 For #1638, #307, define webrtc:// url for play 2020-03-14 22:48:02 +08:00
winlin
12e99f1897 For #1638, #307, use webrtc adapter.js for demo. 2020-03-14 21:14:17 +08:00
winlin
a42cf3ae8d For #1638, #307, refactor rtc config. 2020-03-14 18:05:58 +08:00
winlin
51af2b4779 For #1638, #307, rtc conf support ENV. 2020-03-14 17:15:46 +08:00
HuyaJohn
b730458d51 add candidates ip list, add rtc_upload.html to test 2020-03-06 23:28:15 -08:00
xiaozhihong
a36ed6954f add rtc.html temp 2020-03-06 23:59:59 +08:00
xiaozhihong
bc22ebe949 add rtc http request and response, exchange sdp. 2020-02-21 23:50:22 +08:00
winlin
4276bea463 Migrating streaming service from ossrs.net to r.ossrs.net 2020-02-14 22:00:58 +08:00
winlin
23324cde31 Migrating streaming service from ossrs.net to r.ossrs.net 2020-02-14 21:57:02 +08:00
winlin
be0cb164ec Add links for flv.js, hls.js and dash.js 2019-12-27 10:40:44 +08:00
winlin
c2e9e96e28 Change the default page to srs_player 2019-12-27 09:11:26 +08:00
winlin
6eec7c1dfe Refactor the query string for srs-player 2019-12-18 14:46:21 +08:00
winlin
b52628ce01 Refactor the comments to use flash publisher 2019-12-18 14:37:39 +08:00
winlin
931496e3b9 Refactor the comments to use flash publisher 2019-12-18 14:37:10 +08:00
winlin
4e3650b8c7 Refactor the comments to use flash publisher 2019-12-18 14:35:43 +08:00
winlin
dd44d76d72 Refactor the comments to use flash publisher 2019-12-18 14:35:07 +08:00
winlin
7497df7a15 Refactor the comments to enable flash 2019-12-18 13:59:05 +08:00
winlin
4a5afe3428 Add tips when flash is disabled. 2019-12-18 12:06:32 +08:00
winlin
901c69b381 Update srs-player version 2019-12-18 11:54:17 +08:00
winlin
cef7ec79b3 Detect whether flash enabled for srs-bwt. 2019-12-18 11:50:43 +08:00
winlin
c830dc6700 Detect whether flash enabled for srs-publisher. 2019-12-18 11:33:34 +08:00
winlin
b0afc00733 Detect whether flash enabled for srs-player. 3.0.73 2019-12-18 11:06:01 +08:00
winlin
33c7f6d0e4 Temporarily disable chat demo page. 2019-12-18 09:16:56 +08:00
winlin
65c66592e9 Refine statistic url 2019-12-04 10:47:02 +08:00
winlin
2d85b036cb Refine stat for player index 2019-12-03 18:26:01 +08:00
winlin
643d06473f Refine player with statistics. 2019-12-03 10:18:13 +08:00
winlin
c646e3f287 CI: Research support codecov 2019-02-03 09:27:08 +08:00
winlin
a9b5d65ca7 For #1202, Support auth_key param for srs player 2018-08-12 11:52:18 +08:00
winlin
31945c244d For #1110, Refine code. 2018-08-05 11:09:48 +08:00
winlin
82457cda4b Change date from 2017 to 2018 2018-01-07 11:00:58 +08:00
ME_Kun_Han
3744606c9b fix bug: parsing Exp-Golomb codes failed (#978) 2017-09-19 18:57:37 +08:00
winlin
12a55cd0c2 Fix build failed. 2017-05-30 09:58:14 +08:00
winlin
86f3bd7a0f Fix build failed. 2017-05-30 09:57:57 +08:00
winlin
121eadbc07 Fix build failed. 2017-05-30 09:54:38 +08:00
winlin
54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 2017-05-30 07:40:18 +08:00
winlin
609605a50b Fix #820, extract service for modules. 3.0.21 2017-03-26 17:05:50 +08:00
winlin
0a57a46016 Refine LICENSE 2017-03-25 21:29:29 +08:00
winlin
f32aab3d92 For #299, refine code. 2017-03-25 17:21:39 +08:00
winlin
14765c2ba5 For #790, play or publish is not neccessary for bandwidth test. 2017-03-04 14:46:48 +08:00
ME_Kun_Han
3562424ee3 fix bug, add param for generating tc url and add play stream to make-bandwidth checking success (#790) 2017-03-04 14:44:34 +08:00
winlin
72c4ae4a8c Refine srs-librtmp API, change print to format 2017-03-01 10:52:57 +08:00
winlin
68a5407b3a Remove using of connect_app2. 2017-02-28 20:35:56 +08:00
winlin
c849010fe2 Refine api for srs-librtmp 2017-02-28 19:46:09 +08:00
winlin
ca43bfe6d9 Fix build failed, for srs librtmp API changed. 2017-02-28 14:54:53 +08:00
winlin
764cf245e9 For #774, build librtmp exmaples failed for -lpthread 2017-02-25 12:13:12 +08:00
HungMingWu
01d5e4da17 Replace openssl from l-1.0.1f to 1.10e (#774) 
DUe to API breakchange, add a wrapper for backward compatibility
 2017-02-25 12:06:39 +08:00
winlin
733ba73d54 for #738, write mp4 samples. 2017-02-05 09:15:46 +08:00
winlin
253ac40312 for #738, parse avcc/sps/pps/asc from mp4. 2017-02-04 14:57:07 +08:00
winlin
128a1fd3db for #738, decode mp4 video track boxes. 2017-02-02 15:10:11 +08:00
winlin
b6bb3f2446 fix c99 build failed. 2017-01-31 22:17:27 +08:00
winlin
858951da49 for #738, add srs ingest mp4 2017-01-31 21:36:51 +08:00
winlin
34a8eb6113 for #738, add srs ingest mp4 tool 2017-01-31 20:43:48 +08:00
winlin
b16ab038ce for #742, refine the u_intxx_t to uintxx_t 2017-01-30 17:32:18 +08:00
winlin
136a7ef488 for #299, refine docs. 2017-01-26 17:28:49 +08:00
winlin
c5fcc15989 update the date info 2017-01-18 16:41:47 +08:00
winlin
78aa518ecc merge srs2 2016-09-27 11:00:13 +08:00
winlin
b19702f669 update srs player 2016-09-27 10:58:04 +08:00
winlin
0596550a72 Merge branch '2.0release' into develop 2016-09-15 13:31:28 +08:00
winlin
99d87f9f9c fix sys-ssl librtmp build bug. 2016-09-15 13:17:58 +08:00
winlin
4bcd90d747 fix sys-ssl librtmp build bug. 2016-09-15 13:11:42 +08:00
winlin
c231f45fe8 Merge branch '2.0release' into develop 2016-09-09 14:57:58 +08:00
winlin
bd652e4607 fix build failed for stdc++ 2016-09-09 14:41:02 +08:00
winlin
eb915413ad Merge branch '2.0release' into develop 2016-09-09 14:14:22 +08:00
winlin
0015b303a6 librtmp: refine comment for NALU process. 2016-09-09 14:14:12 +08:00
winlin
93eb961b4c Merge branch '2.0release' into develop 2016-09-09 11:33:58 +08:00
winlin
4c6c2c28b8 refine h264 raw publish with fps 2016-09-09 11:32:24 +08:00
winlin
14760003ba merge from 2.0 2016-08-10 22:05:21 +08:00