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