Commit Graph

241 Commits

Author SHA1 Message Date
winlin
fca81f02f5 Refactor code, add comment when string.assign(xx, 0) 2020-04-11 09:00:50 +08:00
winlin
35a037cf05 Add api for tcmalloc 2020-04-07 14:24:14 +08:00
winlin
c5c0df6536 Update build script 2020-04-04 15:44:56 +08:00
winlin
c2b02f86fa Merge 4.0release 2020-03-28 17:46:47 +08:00
winlin
217b8b94b6 Merge 3.0release 2020-03-28 17:45:14 +08:00
winlin
c339542ce0 Support macOS OSX 2020-03-28 17:20:40 +08:00
winlin
caf7e9e6ea Merge branch 'feature/rtc' into develop 2020-03-22 18:53:39 +08:00
winlin
602a478e1b For #1659, #307, add switch to disable rtc 2020-03-22 18:17:05 +08:00
winlin
955de3dac9 Merge branch '3.0release' into 4.0release 2020-03-21 19:36:16 +08:00
winlin
2c4dc0fb3d For #1638, #307, extract rtc server to hybrid manager. 2020-03-17 17:56:37 +08:00
winlin
9ba861f42f 3.0release is beta now 2020-03-16 15:11:34 +08:00
winlin
51af2b4779 For #1638, #307, rtc conf support ENV. 2020-03-14 17:15:46 +08:00
winlin
1382337cb4 Merge SRS3 2020-03-12 22:42:33 +08:00
winlin
9b663c070a Fix #1635, support auto reaload config by inotify. 3.0.129 2020-03-12 18:14:23 +08:00
winlin
b33751e2c1 Merge SRS3 2020-03-12 12:18:15 +08:00
winlin
ed41ca867b For #1594, detect and disable daemon for docker. 3.0.127 2020-03-12 10:11:41 +08:00
winlin
5d0833fcc3 Add author runner365 2020-01-24 18:41:09 +08:00
winlin
5f174552f3 Merge SRT 2020-01-24 16:10:40 +08:00
winlin
7c9b31815f Refactor code, add stop for hybrid server to do cleanup. 2020-01-23 21:16:34 +08:00
winlin
33c6bf1f8f Refactor SRT, using reverse dependency, SRT depends on APP. 2020-01-23 19:40:40 +08:00
winlin
1959d1d920 Extract hybrid server for SRT 2020-01-23 18:21:11 +08:00
winlin
225c830971 Refine main run process 2020-01-23 17:44:36 +08:00
winlin
f143757429 Use macro to disable SRT in code 2020-01-23 14:23:09 +08:00
winlin
ba61fe8bc5 Fix #1221, remove complex configure options. 3.0.104 2020-01-21 15:22:55 +08:00
winlin
0df108740a Fix #1547, support crossbuild for ARM/MIPS. 2020-01-21 13:59:43 +08:00
winlin
a6fe4e80d3 For #1547, remove the SRS_OSX macro in code 2020-01-20 11:25:39 +08:00
winlin
d783a12f89 Happy 2020 2019-12-30 10:10:35 +08:00
winlin
a11461905b Remove FFMPEG and NGINX, please use srs-docker instead . 3.0.82 2019-12-25 18:29:07 +08:00
winlin
dffc96d2fe For #1537, disable crossbuild for ARM/MIPS. 2019-12-25 13:17:49 +08:00
winlin
5d17bb8bb0 Remove KAFKA. 3.0.53 2019-10-03 12:45:38 +08:00
winlin
5d8fb01b45 Fix #1352, fix typo of daemon. 2019-05-07 07:46:20 +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
394cdb5f04 Refine in time unit. 3.0.49 2019-04-22 08:12:17 +08:00
winlin
c1b64ba24f Refine get_queue_length and set_queue_size in time unit 2019-04-16 07:55:19 +08:00
winlin
53357e92fe Refine headers 2019-04-11 09:27:16 +08:00
winlin
170872135d Refine get_publish_1stpkt_timeout in time unit 2019-04-10 07:53:09 +08:00
winlin
d6828a3e58 Refine get_mw_sleep in time unit 2019-04-09 09:39:16 +08:00
winlin
839a496d50 Refine get_mr_sleep in time unit 2019-04-09 09:20:44 +08:00
winlin
b2d1d84634 Change to 2019 2019-01-01 21:37:28 +08:00
winlin
2e9bf2af83 Always enable SRS_StreamCaster 2018-12-22 20:45:25 +08:00
winlin
aa1a5442f9 Always enable SRS_Ingest 2018-12-22 20:30:13 +08:00
winlin
0bc7fdbb35 Always enable SRS_SSL 2018-12-22 20:03:40 +08:00
winlin
8e294709b0 Always enable SRS_STAT 2018-12-22 19:58:36 +08:00
winlin
71f1ccbf90 Always enable SRS_HLS 2018-12-22 19:54:10 +08:00
winlin
f003ba9a29 Always enable SRS_DVR 2018-12-22 19:50:57 +08:00
winlin
330100769f Always enable SRS_TRANSCODE 2018-12-22 19:48:55 +08:00
winlin
ca1395a807 Change date from 2017 to 2018 2018-01-07 10:58:53 +08:00
winlin
9db2a04c3b For #913, coroutine support complex error. 2017-06-11 18:44:20 +08:00
winlin
b5c14938d9 For #913, config and log support complex error. 2017-06-11 14:03:19 +08:00
winlin
a20e2c3ef6 For #913, refine server utility 2017-06-10 15:20:48 +08:00
winlin
ca9f0bdb1e For #913, refine server initialize st 2017-06-10 14:29:41 +08:00
winlin
bb200b5d2d For #913, add complex error. 2017-06-09 11:50:35 +08:00
winlin
1bf99e8f3e For #907, Wrap ST, only use in service ST. 2017-05-30 09:05:02 +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
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
ad87bd7cf2 Refine configure 2017-03-01 09:21:20 +08:00
winlin
5e419c66f8 For #299, add dash files. 2017-02-11 21:14:28 +08:00
winlin
7057bb1ef5 for #742, always enable http utilities. 2017-01-23 17:55:52 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
439c67018d remove unused macros. 2016-12-09 15:58:59 +08:00
winlin
9e9cad1826 refine messages 2016-12-08 17:55:11 +08:00
winlin
dd1c769f65 refine main 2016-12-08 17:35:33 +08:00
winlin
83c251fc1c fix bug 2016-12-08 17:29:13 +08:00
winlin
2d387035cd refine the global variables. 2016-12-08 17:26:04 +08:00
winlin
9a3674c624 refine kafka 2016-12-08 11:44:49 +08:00
winlin
9cc528cd33 merge srs2 2016-09-23 15:47:17 +08:00
winlin
3659eec9d1 update the cwd 2016-09-23 15:37:51 +08:00
winlin
0e308b0fa1 merge srs2, support oryx 2016-09-23 15:33:43 +08:00
winlin
2a01540433 support change work_dir for oryx. 2016-09-23 14:53:58 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
5338f21439 merge from srs2 2016-01-05 16:58:21 +08:00
winlin
8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 2016-01-05 16:49:27 +08:00
winlin
dc38ae1687 show first message when not show version. 2016-01-04 17:41:16 +08:00
winlin
9d22d09646 show signature of server. 2016-01-04 17:28:18 +08:00
winlin
973194c663 merge from srs2. 2015-12-31 16:02:01 +08:00
winlin
26211abf2e refine code. 2015-12-31 15:57:16 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
cfe230438a revert test code 2015-11-30 19:07:52 +08:00
winlin
6191e0af90 s1 compute key. 2015-11-30 19:05:25 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
390f58e186 fix compile failed. 2015-10-27 17:57:58 +08:00
winlin
f187a7deef refine the startup logs. 2015-09-24 12:15:12 +08:00
winlin
396bb43672 Merge branch '2.0release' into develop 2015-09-23 15:46:58 +08:00
winlin
8b1198562a show cpu info. 2015-09-23 15:46:51 +08:00
winlin
abb5c5ad31 add kafka producer 2015-09-22 17:40:05 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
winlin
4763f205a2 add kbps for vhost and stream 2015-08-22 09:49:38 +08:00
winlin
0d66e92ab5 refine code, support configure to enable --memory-watch 2015-06-13 15:45:25 +08:00
winlin
7996b3b789 add warning for gmp, use gmc to detect memory leak. 2015-06-09 10:52:32 +08:00
winlin
573495a19f refine the memory watcher. 2015-06-08 09:47:45 +08:00
winlin
fec8422d6b fix bug of configure. 2015-05-27 10:23:40 +08:00
winlin
44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 2015-05-19 18:06:20 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
717d088376 support server cycle handler. 2.0.153. 2015-03-31 18:06:55 +08:00
winlin
d349a3dbda update stable version check 2015-03-15 08:15:04 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00