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
6965 commits 13 branches 107 tags 375 MiB
Commit graph

470 commits

Author SHA1 Message Date
kyxlx550
6a070a9a64 support sip ptz cmd 2020-04-20 21:34:18 +08:00
kyxlx550
167711400a fix cascade SIP bye failed 2020-04-19 00:18:30 +08:00
kyxlx550
98c29b2b9a fix sip stack param check error 2020-04-17 00:17:47 +08:00
kyxlx550
95b869245b fix sip message parse error 2020-04-15 12:06:27 +08:00
winlin
6cf9933bf3 For #307, refine gperf api 2020-04-14 21:49:49 +08:00
winlin
03a03e4174 Refine stat for GSO 2020-04-14 13:47:23 +08:00
kyxlx550
1e0474e470 support sip query catalog message, parse xml to map, nvr 2020-04-11 20:18:38 +08:00
winlin
9b2f429571 Allows empty body metadata. 2020-04-09 20:43:51 +08:00
winlin
49f88a3326
Merge pull request #1691 from xialixin/dev-28181 
Dev 28181
 2020-04-09 08:28:53 +08:00
winlin
40c95b04ca Merge remote-tracking branch 'winlin/feature/perf_stat' into feature/rtc 2020-04-05 23:01:21 +08:00
xialixin
9e9b5374d5 srs_get_sip_utc_date external use 2020-04-05 13:51:19 +08:00
xialixin
ac8acc0b22 fix 28281 to 28181, sip heart message, timeout channel peer ip and port reset 2020-04-04 16:07:23 +08:00
winlin
0ff3ce7464 Merge remote-tracking branch 'john/rtc' into feature/rtc 2020-04-03 15:17:13 +08:00
winlin
9ad5a5d9b6 RTC support openssl 1.0.* 2020-04-03 13:41:45 +08:00
xiaozhihong
d6adb5cd8d process USE-CANDIDATE/ICE-CONTROLLING/ICE-CONTROLLED atrribute in STUN 2020-04-02 21:31:06 +08:00
winlin
d81cde695d Refactor code 2020-03-31 22:48:38 +08:00
winlin
e19b927f92 Merge GB28181 2020-03-31 22:45:20 +08:00
winlin
6012ac4eb0 Refine code 2020-03-31 22:30:57 +08:00
winlin
a342f460e7 Merge branch '4.0release' into xialixin-dev-28181 2020-03-31 20:09:07 +08:00
winlin
33455867f9 Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181 2020-03-31 20:08:24 +08:00
winlin
45db63249d Update author to John for RTC 2020-03-31 18:03:04 +08:00
xialixin
c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 2020-03-31 00:39:10 +08:00
winlin
c2b02f86fa Merge 4.0release 2020-03-28 17:46:47 +08:00
winlin
90a39ec46d Add api to stat mw iovec 2020-03-27 13:37:39 +08:00
winlin
be746da21c Merge branch '3.0release' into 4.0release 2020-03-21 22:42:17 +08:00
winlin
f89b4b3b26 For #1651, fix return pnwrite of srs_write_large_iovs. 3.0.135 2020-03-21 20:20:40 +08:00
winlin
de9a004ff7 Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2 2020-03-20 21:39:04 +08:00
xialixin
8b4f84e336 fix push.gb28181.conf, gb28181conn repeat call serve() 2020-03-20 10:38:38 +08:00
xialixin
cbe9c1dabc Support gb28181 sip over udp, ps steam over rtp 2020-03-20 00:01:48 +08:00
l
bbfb03f98a
修复srs_write_large_iovs中nwrite未累加的错误 2020-03-19 14:36:56 +08:00
winlin
b5dd502103 For #1638, #307, fix build warnings 2020-03-17 09:16:52 +08:00
HuyaJohn
e8b2bb5d28 process err, do error check, add some error code 2020-03-16 07:35:24 -07:00
winlin
60c8b37f05 For #1638, #307, merge john, add NACK suport, remove debug code, verbose log 2020-03-14 22:51:35 +08:00
xiaozhihong
2b56f9ee59 add NACK suport, remove debug code, verbose log 2020-03-14 22:11:01 +08:00
xiaozhihong
6c88f58079 remove debug code, fix rtc.html 2020-03-13 22:50:34 +08:00
winlin
d21ef106a0 Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc 2020-03-13 21:18:09 +08:00
winlin
a7c8980a60 For #1636, muxing sh, use sound_rate if aac sr not set. 2020-03-13 17:36:22 +08:00
winlin
7036f839d2 For #1636, add comments 2020-03-13 17:05:22 +08:00
winlin
aa20a04abb For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13 2020-03-13 16:56:00 +08:00
runner365
b9195122cf support all sample rate in aac 2020-03-12 20:30:07 +08:00
xiaozhihong
c62901a3ac make code easy, wrap udp remux socket 2020-03-08 00:30:31 +08:00
xiaozhihong
9d5495c0c2 "stun and dtls done" 2020-03-06 23:01:48 +08:00
xiaozhihong
62563bdd81 rtc framework 2020-02-28 23:18:39 +08:00
winlin
04d0620dde For #1615, fix build failed and srt api issue 2020-02-25 13:45:05 +08:00
xiaozhihong
51abb0844e rtp session manager, stun codding 2020-02-23 23:19:40 +08:00
winlin
5d0833fcc3 Add author runner365 2020-01-24 18:41:09 +08:00
winlin
0e750ab3eb For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100 2020-01-16 14:28:05 +08:00
winlin
10464a5fbe Always use string instance to avoid crash risk. 3.0.95 2020-01-05 22:17:15 +08:00
winlin
6d0ac35db9 Merge 2.0release #1551 2020-01-05 14:43:46 +08:00
winlin
b5f4b96060 Merge #1551, fix memory leak in RTSP stack. 2.0.270 2020-01-05 14:41:31 +08:00
alphonsetai
763c06976a fix memory leak 2020-01-05 14:38:08 +08:00
winlin
d783a12f89 Happy 2020 2019-12-30 10:10:35 +08:00
winlin
b9d720c927 For #1105, http server support mp4 range. 2019-12-26 18:33:52 +08:00
winlin
0e0889af02 For #1538, fresh chunk allow fmt=0 or fmt=1. 3.0.83 2019-12-25 19:04:15 +08:00
winlin
7eccc9da26 For #1508, support chunk length and content in multiple parts. 2019-12-24 14:58:35 +08:00
winlin
a35a7f915e Fix bug for HTTP write jsonp for srs-console. 2019-12-24 10:32:52 +08:00
winlin
40f6ecaee2 Merge SRS2 for running srs-librtmp on Windows. 3.0.80 2019-12-23 21:09:00 +08:00
winlin
c5f31570cd Support parsing vhost splited by single seperator. 2.0.268 2019-12-23 18:31:14 +08:00
winlin
01a4503ceb Support build srs-librtmp by VS2015. 2.0.267 2019-12-23 18:12:45 +08:00
winlin
08bbbc5414 Support build srs-librtmp by VS2015. 2.0.267 2019-12-23 17:11:31 +08:00
winlin
316628632b Support build srs-librtmp by VS2015. 2.0.267 2019-12-23 17:01:02 +08:00
winlin
ae785eda8d Improve test coverage for kernel fast stream. 2019-12-20 18:56:53 +08:00
winlin
fc9855bc7a Refine the RTMP iovs cache increasing to much faster. 2019-12-19 15:04:14 +08:00
winlin
49c737f996 Fix #1524, memory leak for amf0 strict array. 3.0.75 2019-12-19 14:39:34 +08:00
winlin
25f132ec2f Improve test coverage for protocols. 2019-12-18 21:18:11 +08:00
winlin
23a1674ce0 Improve coverage for RAW AVC protocol. 2019-12-18 20:13:11 +08:00
winlin
8047d0df45 For #1042, add test for RAW AVC protocol. 2019-12-18 15:50:17 +08:00
winlin
216a23f709 Fix the http implicit handler bug 2019-12-17 21:24:24 +08:00
winlin
dc1afc142f Fix HTTP CORS bug when sending response for OPTIONS. 3.0.72 2019-12-17 20:52:10 +08:00
winlin
ec0fb82c0e Improve test coverage for http server mux. 2019-12-17 19:39:36 +08:00
winlin
e27cc059e4 Ignore coverage for http-parser 2019-12-17 17:37:29 +08:00
winlin
df359f747a Ignore coverage for json-parser 2019-12-17 17:30:49 +08:00
winlin
d9842b0371 Refactor HttpResponseWriter.write, default to single text mode. 2019-12-17 15:14:59 +08:00
winlin
8cdb7cc727 Add test for vod stream handler 2019-12-17 14:33:47 +08:00
winlin
97f2c5bf0c Refactor http static file server path resolving. 2019-12-16 20:07:06 +08:00
winlin
fa362607b2 Add test for http basic handler 2019-12-16 19:32:41 +08:00
winlin
45ed458927 Eliminate dead code of ts cache for HTTP message 2019-12-16 16:07:17 +08:00
winlin
ca2b68f428 Refactor header of HTTP message by using SrsHttpHeader. 2019-12-16 16:00:02 +08:00
winlin
dcb7b6aae0 Refactor HTTP Message by decoupling with http_parser 2019-12-16 15:12:26 +08:00
winlin
547cd4f518 Word the comments about the order of HTTP header 2019-12-16 12:25:29 +08:00
winlin
8c10c26f00 Improve the coverage for HTTP error response. 2019-12-16 11:36:39 +08:00
winlin
474266eae7 Refine the comments for http content-type detecting 2019-12-14 23:34:09 +08:00
winlin
4758a284d7 Add test for http status. 2019-12-14 10:12:25 +08:00
winlin
8d9554df8e Remove dead code in SrsRtmpClient::handshake 2019-12-13 16:31:32 +08:00
winlin
1c391c85ae Merge 2.0release 2019-12-13 10:47:04 +08:00
winlin
fde11756c3 Support openssl versions greater than 1.1.0. 2.0.266 2019-12-13 10:40:11 +08:00
winlin
cfcb3ce7b2 For #1042, cover RTMP other codes 2019-12-12 15:46:46 +08:00
winlin
2731fe1f3e SrsPacket supports converting to message, so can be sent by one API. 2019-12-12 15:11:31 +08:00
winlin
22d4159373 For #1042, cover RTMP server response commands. 2019-12-11 18:43:37 +08:00
winlin
9c62a68e15 For #1042, cover RTMP server response commands. 2019-12-11 18:25:47 +08:00
winlin
4f298134af Fix #1445, limit the createStream recursive depth. 3.0.70 2019-12-11 17:56:31 +08:00
winlin
f51f1efe42 For #1042, cover RTMP handshake protocol. 2019-12-11 14:32:57 +08:00
winlin
2731afc161 Cover protocol stack RTMP. 3.0.63 2019-11-20 14:08:53 +08:00
winlin
1b2449ca3f Cover JSON codec. 3.0.62 2019-10-23 08:47:02 +08:00
winlin
1ebec34d5b Cover JSON codec. 3.0.62 2019-10-22 09:58:09 +08:00
winlin
e683f07715 Cover JSON codec. 3.0.62 2019-10-22 09:01:29 +08:00
winlin
c7602d8cee Cover JSON codec. 3.0.62 2019-10-22 08:54:29 +08:00
winlin
f8943f8f7d Cover AMF0 codec. 3.0.61 2019-10-12 08:39:40 +08:00
winlin
f24d82fada Cover AMF0 codec. 3.0.61 2019-10-10 08:49:57 +08:00
winlin
88df9a2497 Support go-oryx rtmplb with proxy protocol. 3.0.56 2019-10-04 19:03:34 +08:00
winlin
5d17bb8bb0 Remove KAFKA. 3.0.53 2019-10-03 12:45:38 +08:00
winlin
ccba55cdd8 Migrate is_never_timeout to utility. 2019-05-09 08:42:53 +08:00
winlin
6dbe79ad02 Remove noisy informations. 2019-04-30 08:43:12 +08:00
winlin
ad3749a4d5 Remove noisy informations. 2019-04-30 08:38:57 +08:00
winlin
6b2c71d385 Refine typo in files. 3.0.51 2019-04-30 08:30:13 +08:00
winlin
8a94ac4b49 Upgrade http-parser to 2.9.2 2019-04-25 10:39:38 +08:00
winlin
cfc92d5e93 Use http-parser 2.9.2 2019-04-24 09:37:25 +08:00
winlin
646d490a18 Reset http-parser 2.1 2019-04-23 08:31:21 +08:00
winlin
6e9bba4220 Refine SrsHttpUri. 2019-04-23 08:26:15 +08:00
winlin
b285029e15 Refine SrsHttpUri.get_uri_field, without depends on http parser. 2019-04-23 08:17:59 +08:00
winlin
8bc77387ff Refine typo in protocol. 2019-04-23 08:06:50 +08:00
winlin
394cdb5f04 Refine in time unit. 3.0.49 2019-04-22 08:12:17 +08:00
winlin
c6dcc76fea Refine SrsRequest.duration in time unit. 2019-04-19 08:48:44 +08:00
winlin
cfab73b552 Refine SrsWallClock and SrsKbps in time unit. 2019-04-19 08:39:38 +08:00
winlin
d306ee7506 Refine ms in time unit 2019-04-18 08:50:43 +08:00
winlin
33c66b64c5 Refine name TMMS to TIMEOUT 2019-04-18 07:47:35 +08:00
winlin
5a45fd98c3 Refine get_recv_timeout and is_never_timeout in time unit 2019-04-17 08:38:34 +08:00
winlin
d3dc45f357 Refine set_recv_timeout in time unit 2019-04-17 08:31:53 +08:00
winlin
38bbf6b111 Refine get_send_timeout in time unit 2019-04-17 08:23:15 +08:00
winlin
f4bee37e76 Refine set_send_timeout in time unit 2019-04-17 08:18:37 +08:00
winlin
0879bef9b2 Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT 2019-04-11 09:33:26 +08:00
winlin
92980a0ca2 Refine SRS_CONSTS_RTMP_TMMS in time unit 2019-04-11 09:18:20 +08:00
winlin
6c12aa0eca Refine srs_update_system_time in time unit 2019-04-10 09:07:03 +08:00
winlin
633a9a0d35 Merge #1324, Remove dead code 2019-04-05 18:55:33 +08:00
winlin
3064b941d5 CI: Cover kernel codec av frame and format 2019-02-04 12:05:07 +08:00
winlin
b4619e3393 Kbps: Remove the union for kbps slice 2019-02-02 18:20:19 +08:00
winlin
b2d1d84634 Change to 2019 2019-01-01 21:37:28 +08:00
winlin
6e44aa4a4f Cover Kbps statistic 2019-01-01 18:22:11 +08:00
winlin
6234905532 Refactor ISrsKbpsDelta 2019-01-01 17:36:27 +08:00
winlin
dcebf8a31f Refine kbps 2019-01-01 14:04:50 +08:00
winlin
aef838338c Add utest for kbps connections 2018-12-23 21:19:17 +08:00
winlin
c26b475bae Refine kbps, stub wall clock 2018-12-23 20:47:17 +08:00
winlin
4c40370986 Refine kbps more testable 2018-12-23 20:30:12 +08:00
winlin
16fa4c588a Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter 2018-12-23 20:08:04 +08:00
winlin
6e75993e7f Change public virtual to virtual public 2018-12-23 19:54:08 +08:00
winlin
2e9bf2af83 Always enable SRS_StreamCaster 2018-12-22 20:45:25 +08:00
winlin
c6844527fb Always enable SRS_SSL 2018-12-22 20:23:39 +08:00
winlin
0bc7fdbb35 Always enable SRS_SSL 2018-12-22 20:03:40 +08:00
winlin
f1ab8fecac Fix build warning 2018-12-09 22:48:47 +08:00
winlin
24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 2018-11-11 13:51:10 +08:00
MakarovYaroslav
e62ac29f48 add ignoring _definst_ at the end of app (#1261) 2018-11-11 13:31:29 +08:00
winlin
728ddd133b For #1202, Support edge/forward to Aliyun CDN. 3.0.40 2018-08-12 10:46:06 +08:00
winlin
74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 2018-08-12 10:44:55 +08:00
winlin
1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 2018-08-11 19:23:51 +08:00
winlin
1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 2018-08-11 19:09:56 +08:00
winlin
68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 2018-08-02 09:17:49 +08:00
winlin
41c6e833b9 Replace hex to string to match MIT license. 3.0.33 2018-07-22 18:47:38 +08:00
winlin
84f81983aa Replace base64 to match MIT license. 3.0.32 2018-07-22 17:56:38 +08:00
winlin
469250f850 For #464, support origin cluster api 2018-02-15 20:55:34 +08:00
winlin
db6b8cf914 Fix #1057, switch to simple handshake. 3.0.28 2018-02-13 09:05:01 +08:00