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

384 commits

Author SHA1 Message Date
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
winlin
681138d2af Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27 2018-02-13 08:52:57 +08:00
winlin
1721e4ea4b Fix #1059, support vhost in stream parameters. 2.0.246 2018-02-13 08:31:25 +08:00
winlin
ca1395a807 Change date from 2017 to 2018 2018-01-07 10:58:53 +08:00
winlin
aebbbadf42 For #913, Service support complex error. 2018-01-01 11:41:15 +08:00
winlin
15aea686c3 For #913, KAFKA, RTSP support complex error. 2018-01-01 10:30:31 +08:00
winlin
70a20ffadb For #913, RTMP support complex error. 2018-01-01 09:38:22 +08:00
winlin
60accb6e54 For #913, AMF0 and RTMP support complex error. 2017-12-31 20:52:04 +08:00
winlin
204ef041da For #913, Kernel MP4 FLV HTTP support complex error. 2017-12-31 12:11:48 +08:00
winlin
9802dc326e For #913, source support complex error 2017-09-23 22:12:33 +08:00
winlin
9f5224c34a For #913, use complex error for http 2017-07-29 21:39:57 +08:00
winlin
b3825c4021 Fix warnings 2017-06-13 16:10:46 +08:00
winlin
a20e2c3ef6 For #913, refine server utility 2017-06-10 15:20:48 +08:00
winlin
93710c7489 For #913, refine the error mechanism 2017-06-09 13:29:23 +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
366d6bcb82 Refine code 2017-05-13 21:47:20 +08:00
HungMingWu
815d50f00a Remove warning: C++11 requires a space between string literal and macro (#874) 
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
 2017-05-06 14:05:22 +08:00
winlin
9a2a6ab95f Merge SRS2 2017-04-18 11:42:11 +08:00
winlin
5e284b58a4 Fix #848, crash at HTTP fast buffer grow 2.0.239 2017-04-18 11:41:09 +08:00
winlin
1054b0a90f Merge SRS2 2017-04-15 20:46:00 +08:00
winlin
33a0abdeff Fix #844, support Haivision encoder. 2.0.238 2017-04-15 20:44:02 +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
Chengdong Zhang
8ad934a8a4 srs_info use not available variable (#813) 
srs_info use not available variable.
Variable has been removed or changed.
 2017-03-24 23:42:37 -05:00
winlin
ce034c3556 Refine docs, add TURN/STUN rfc. 2017-03-06 10:19:19 +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
8ab43b3e78 Fix #794, refine the comments. 2017-03-04 14:29:17 +08:00
winlin
26c20db2b3 Fix parse srs version bug 2017-02-28 20:03:46 +08:00
winlin
c849010fe2 Refine api for srs-librtmp 2017-02-28 19:46:09 +08:00
winlin
747d6f2f52 For #299, write legal MPD, fix CORS. 2017-02-26 21:45:08 +08:00
winlin
8ab727f3c5 For #299, write MPD file. 2017-02-26 20:40:33 +08:00
winlin
3903d2a8e3 For #730, remove the test code. 2.0.234 2017-02-25 20:24:18 +08:00
winlin
ac0e27b936 For #774, refine code style 2017-02-25 12:10:41 +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
695ceeab48 Refine code for #777 2017-02-25 11:30:25 +08:00
Chengdong Zhang
a3df4e3bfb Fix #744 http callback set a wrong default port (#777) 
* Add port verify

Code is more robust

* Verify port

Verify port

* Change hard code to defined.

Change hard code to defined.
 2017-02-25 11:28:59 +08:00
winlin
caf69f193d for #299, refine the codec object name 2017-02-12 20:38:39 +08:00
winlin
d7458c4e72 For #299, refine the codec to format-frame-sample chain. 2017-02-12 18:18:18 +08:00
winlin
c4a510b834 For #299, refine the codec info structure. 2017-02-11 23:09:23 +08:00
winlin
afbc3443f3 fix #738, support DVR general mp4. 3.0.17 2017-02-07 21:56:20 +08:00
winlin
733ba73d54 for #738, write mp4 samples. 2017-02-05 09:15:46 +08:00
winlin
d3bb8b6a86 for #742, refine the io interfaces. 2017-01-30 19:59:59 +08:00
winlin
eaa222f034 for #742, refine the file reader and writer interface. 2017-01-30 19:35:04 +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
5c959fc781 merge from srs2, for kbps free io 2017-01-22 13:16:05 +08:00
winlin
6706bda42c for #752, release the io then free it for kbps. 2.0.232 2017-01-22 13:12:56 +08:00
winlin
7acc3aca16 refine hijack io for srslibrtmp 2017-01-18 16:23:59 +08:00
winlin
3fe338d1c5 for #742, use ms for application clock tbn. 2017-01-17 12:25:30 +08:00
winlin
1ed5118246 refine the spaces, no TABS 2017-01-16 15:47:26 +08:00
winlin
f92db0f87e merge srs2 for kbps 2017-01-11 11:46:50 +08:00
winlin
6a8c232c5b fix #588, kbps interface error. 2.0.228 2017-01-11 11:37:26 +08:00
winlin
c58dbe4d14 fix #588, kbps interface error. 2.0.228 2017-01-11 11:22:16 +08:00
winlin
517812dbe2 remove test code for #730 2017-01-06 15:19:27 +08:00
winlin
1b175b1107 for #730, support config in/out ack size. 3.0.13 2017-01-06 14:57:54 +08:00
winlin
bbbc40f9c2 Merge branch '2.0release' into develop 2017-01-06 14:32:07 +08:00
winlin
aa2b7afb44 refine code, print protocol level info. 2017-01-06 14:32:01 +08:00
winlin
e434c09dc0 for #730, merge srs2 2017-01-06 14:13:19 +08:00
winlin
c67036d52e for #730, reset ack follow flash player rules. 2.0.225 2017-01-06 14:04:34 +08:00
winlin
dc1f227aeb for #730, refine code to decode the acknowledge message 2017-01-06 13:16:25 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
f6661989af fix typo for #513, #691 2016-12-15 15:00:08 +08:00
winlin
f30b3073a2 refine the cros of api for flv 2016-12-15 14:10:02 +08:00
winlin
439c67018d remove unused macros. 2016-12-09 15:58:59 +08:00
winlin
e15e07c4d1 merge srs2 2016-09-15 13:39:25 +08:00
winlin
ff3f8272a9 fix #640, typo for rtmp type. 2.0.217 2016-09-15 13:37:11 +08:00
winlin
504352d17a merge srs2. 2016-09-12 18:21:44 +08:00
winlin
c2cb666995 fix fast stream error bug. 2.0.216 2016-09-12 18:21:14 +08:00
winlin
815f2491a4 merge from 2.0 2016-09-05 09:39:20 +08:00
winlin
6ec60b0a21 fix memory leak at handshake. 2.0.213 2016-09-05 09:38:30 +08:00
winlin
266397acee merge from srs2 2016-01-13 12:46:23 +08:00
winlin
28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 2016-01-13 12:44:51 +08:00
winlin
f971538cf3 refine http, support no host. 2016-01-12 11:53:52 +08:00
winlin
d24aef50ba for #369, support RTMP 302 api at protocol level. 2016-01-08 18:17:37 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
190db75835 refine code for nx_json modify the data when loads. 2015-12-28 17:39:24 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
714c13d88d merge from srs2 2015-12-22 19:19:28 +08:00
winlin
5d3a183f43 fix #509, always alloc big object at heap. 2.0.205 2015-12-22 19:18:46 +08:00
winlin
65b81a4e68 merge from srs2 2015-12-22 17:01:06 +08:00
winlin
8b24319ffb fix #418, ignore null connect props to make RED5 happy. 2.0.204 2015-12-22 17:00:22 +08:00
winlin
8d378cda2e for #418, when simple handshake, copy s1 to c2. 2015-12-22 16:48:06 +08:00
winlin
5f915aa959 merge from srs2 2015-12-22 15:40:03 +08:00
winlin
cee8c3d07d fix #541, failed when chunk size too small. 2.0.202 2015-12-22 15:39:12 +08:00
winlin
fabcc91a0e refine codes. 2015-12-07 18:22:55 +08:00
winlin
b2ae1acaa4 copy http-parser-2.1 into srs http stack. 2015-12-07 11:35:05 +08:00
winlin
fba1122835 private the srs_vhost_resolve 2015-12-07 10:15:08 +08:00