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

319 commits

Author SHA1 Message Date
winlin
79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 2014-07-30 10:00:23 +08:00
winlin
9c11001391 refine log for stats network and disk 2014-07-27 19:03:56 +08:00
winlin
6f700f3f40 rename network_device_index to network 2014-07-27 18:40:32 +08:00
winlin
f4ea48adcb rename network_device_index to network 2014-07-27 18:39:20 +08:00
winlin
b334021836 add config item for the stat disk device name 2014-07-27 16:52:00 +08:00
winlin
e76036f40b refine config heartbeat, add new stats. 0.9.175 2014-07-27 14:43:55 +08:00
winlin
ebf9e560b1 refine the max connections, compare the system ulimit max open files, error when exeed limit 2014-07-26 15:34:45 +08:00
winlin
5f7ff37e64 fix the utest mock config bug 2014-07-26 15:03:07 +08:00
winlin
50cd1d2360 refine the config 2014-07-25 11:05:54 +08:00
winlin
7865b0e935 refine config, check chunk size. 2014-07-25 11:04:13 +08:00
winlin
630bdf0c80 refine config, check the value of http api/stream. 2014-07-25 10:54:36 +08:00
winlin
7207c2f435 refine config, check all config item name. 2014-07-25 10:44:04 +08:00
winlin
1c27f3b913 refine config, warning when feature disabled. 2014-07-25 09:38:48 +08:00
winlin
2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls 2014-07-22 11:01:20 +08:00
winlin
77236920b6 add config utest, for default vhost 2014-07-21 12:13:01 +08:00
winlin
f1b1dc0c64 add utest for config full.conf, fix the chunk-size bug 2014-07-21 10:50:08 +08:00
winlin
0db2e6b8e9 fix the empty config error 2014-07-20 17:08:47 +08:00
winlin
75bfe2af78 refine the LF,CR 2014-07-20 16:19:26 +08:00
winlin
8cd9be4fce add comments for LF,CR 2014-07-20 16:18:26 +08:00
winlin
c65a6b5d63 fix the conf_line bug of parse config directive. 2014-07-20 16:16:29 +08:00
winlin
86ad39f001 finish basic utest for config 2014-07-20 15:53:19 +08:00
winlin
baa20b2f31 refine the config consts 2014-07-20 13:16:24 +08:00
winlin
736ec48c71 move some consts to kernel consts 2014-07-20 13:11:53 +08:00
winlin
073d900674 add consts to kernel 2014-07-20 13:04:48 +08:00
winlin
9bf7b722db fix #119: use iformat and oformat for ffmpeg transcode. 2014-07-19 10:54:38 +08:00
winlin
2f0a72d7d1 refine config, add comments 2014-07-18 12:12:25 +08:00
winlin
a5f4323ea8 refine config, add comments 2014-07-18 11:46:29 +08:00
winlin
b4e2d70390 refine config comments, return the engines of transcode. 2014-07-18 11:15:59 +08:00
winlin
2293700728 refine config, remove the const string& 2014-07-18 10:56:06 +08:00
winlin
1accd8c790 refine config, add comments. 2014-07-18 10:50:02 +08:00
winlin
f572531eca refine config, return the vhosts vector. 2014-07-18 10:35:31 +08:00
winlin
96e0e699dd refine the get port, return a vector<string> contains ports. 2014-07-18 10:21:34 +08:00
winlin
b37aeff8d5 refine config, check name 2014-07-17 12:07:01 +08:00
winlin
25180c51b4 refine the config comments. 2014-07-17 11:53:51 +08:00
winlin
1e8981eb08 extracta parse_buffer for config 2014-07-17 11:34:49 +08:00
winlin
784d7499cf refine config, add error line log 2014-07-17 11:28:20 +08:00
winlin
9f7d488fa4 refine config, add comments. 2014-07-17 11:05:09 +08:00
winlin
f6b084b679 remove the reload create function. 2014-07-16 11:59:44 +08:00
winlin
f4ffe0aaee refine config, move file buffer to internal namespace 2014-07-16 11:49:34 +08:00
winlin
3a1b3dd142 fix bandwidth bug, config item interval to float. 2014-07-12 22:22:56 +08:00
winlin
95e73d0be1 remove the config log http api. 0.9.148 2014-07-05 13:02:50 +08:00
winlin
1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 2014-06-25 17:14:11 +08:00
winlin
f173345e15 support report summaries in heartbeat. 0.9.132 2014-06-23 15:44:49 +08:00
winlin
1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 2014-06-22 20:01:25 +08:00
winlin
41857edaee support edge token traverse, fix #104. 0.9.129 2014-06-21 12:39:04 +08:00
winlin
cbc1486688 refine message, add license 2014-06-14 14:19:19 +08:00
winlin
d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 2014-05-27 14:10:46 +08:00
winlin
344a49918a fix #79: allow edge vhost to add or remove. 2014-05-25 10:07:57 +08:00
winlin
ef0f7f4da8 support http heartbeat, 0.9.107 2014-05-19 17:39:01 +08:00
winlin
7c804277b2 add heatbeat url, add stream for api-server 2014-05-19 15:27:05 +08:00
winlin
d6355efe22 support http api json, to PUT/POST, to 0.9.103 2014-05-18 16:15:35 +08:00
winlin
dc66c525fd refine autofree, only free object, never free arrays 2014-05-14 09:41:41 +08:00
winlin
befde6acf7 fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95 2014-05-13 14:24:39 +08:00
winlin
a1fed15789 add uptime, startup time, load to api 2014-05-08 15:45:51 +08:00
winlin
fc501b050b add atc_auto to disable or enable auto detect atc 2014-04-30 12:08:11 +08:00
winlin
30bb3ff704 add dvr_plan hss to full.conf 2014-04-30 11:56:19 +08:00
winlin
6ee49ee029 bravo auto atc per stream. 0.9.84 2014-04-30 10:17:04 +08:00
winlin
f02ac02a50 auto open atc for bravo_atc set 2014-04-29 18:27:00 +08:00
winlin
23b04e2a57 completed the edge reload, to 0.9.79 2014-04-28 17:57:59 +08:00
winlin
2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 2014-04-26 21:41:18 +08:00
winlin
d6948d613f add author byteman for h264 to flv. 2014-04-25 15:27:50 +08:00
winlin
67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 2014-04-24 16:32:19 +08:00
winlin
733ca2475d call http api when dvr got keyframe 2014-04-22 17:32:45 +08:00
winlin
117fd67950 add cpu stat 2014-04-19 21:23:34 +08:00
winlin
2d1c28cff9 update dvr, support segment plan 2014-04-17 17:35:21 +08:00
winlin
4b82a4f510 support reload dvr 2014-04-17 16:22:21 +08:00
winlin
73459547e1 support dvr. change to 0.9.69 2014-04-17 16:06:49 +08:00
winlin
996d042a33 add comments for file stream 2014-04-17 12:59:35 +08:00
winlin
96115ac4f7 fix bug of config params. x86/x64/pi never use static 2014-04-15 16:07:25 +08:00
winlin
23a1b29935 add dvr option. refine macros of auto headers 2014-04-15 14:01:57 +08:00
winlin
b86c83b0e0 refine the info for log to file. 2014-04-14 12:14:01 +08:00
winlin
73c310cd2e refine the macro. 2014-04-14 09:10:36 +08:00
winlin
a0472f256d support test config file. change to 0.9.61 2014-04-13 16:55:42 +08:00
winlin
f980340e89 refine config option 2014-04-13 13:57:39 +08:00
winlin
aa784377fd refine reload, ignore if parse config file failed. 2014-04-13 13:50:58 +08:00
winlin
cfee761899 support full reload. change to 0.9.60 2014-04-13 13:35:03 +08:00
winlin
bb87272c39 refine reload, rename some vhost specified to add vhost prefix 2014-04-13 13:31:59 +08:00
winlin
dc3c3cff8e support reload http_stream 2014-04-13 13:27:51 +08:00
winlin
c33ff4fdb8 support reload http_api 2014-04-13 13:08:10 +08:00
winlin
821b58af03 support reload atc 2014-04-12 22:00:27 +08:00
winlin
eda1ddc03d support reload log level/logfile/tank 2014-04-12 21:35:26 +08:00
winlin
f652c28485 support reload pid. 2014-04-12 20:46:32 +08:00
winlin
3a26b23fba change ffmpeg log to ./objs 2014-04-10 17:19:49 +08:00
winlin
6c5d8b4851 refine reload config 2014-04-10 14:05:01 +08:00
winlin
bc61b1de18 fix bug of reload ingest 2014-04-10 11:47:38 +08:00
winlin
e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57 2014-04-10 11:40:06 +08:00
winlin
9ed3421586 rename from get_ingest to get_ingest_by_id of config 2014-04-10 11:24:27 +08:00
winlin
e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57. 2014-04-10 11:21:47 +08:00
winlin
e6d8bc1e5c ingest reload: support disable vhost 2014-04-10 10:35:02 +08:00
winlin
dc71eef394 support ingest reload: add new vhost with ingester 2014-04-10 10:09:30 +08:00
winlin
e89ab84e4e implements ingest, change to 0.9.53 2014-04-07 14:20:03 +08:00
winlin
2742679354 implements the ingest framework 2014-04-07 13:32:00 +08:00
winlin
92281548b6 add ingest config 2014-04-07 13:13:57 +08:00
winlin
9107831b0e add config to read ingesters 2014-04-07 11:57:24 +08:00
winlin
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +08:00
winlin
83f35d10b1 add http delivery framework 2014-04-04 18:55:21 +08:00
winlin
8d7877ebd1 refine config, group by sections. 2014-04-04 17:01:34 +08:00
winlin
b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 2014-04-04 15:35:17 +08:00
winlin
6d32ad1828 refine log and thread function name 2014-04-04 12:18:05 +08:00
winlin
3f13726544 add log level in conf. change to 0.9.45 2014-04-03 18:32:51 +08:00
winlin
aa89f9f51e change to 0.9.37, for http api/stream 2014-03-27 12:14:04 +08:00
winlin
0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 2014-03-26 16:25:02 +08:00
winlin
ade3630fa6 add package and install script 2014-03-23 22:52:08 +08:00
winlin
ed20bd7078 default write log to file. 2014-03-23 14:51:35 +08:00
winlin
76290a5a12 fix bug of get daemon 2014-03-23 14:47:09 +08:00
winlin
7930add7f9 add log tank config, default to console. 2014-03-23 14:40:55 +08:00
winlin
3ec3c1f532 support daemon 2014-03-23 12:42:05 +08:00
winlin
2c1354b9b9 fix bug of log message 2014-03-23 12:23:23 +08:00
winlin
56679b3c82 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:22:01 +08:00
winlin
d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:21:36 +08:00
winlin
f25c6558a5 write pid to ./objs/srs.pid. 2014-03-21 15:45:34 +08:00
winlin
a0c0c94cf0 refine conf, add comments for other listen type 2014-03-21 14:00:26 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +08:00
wenjie.zhao
109ce07c1b color text of error msg supported. 
strerror msg supported.
 2014-03-15 04:55:30 +08:00
wenjie.zhao
e0e3504e1d color text of error msg supported. 
strerror msg supported.
 2014-03-15 04:53:46 +08:00
winlin
a90cb9dd84 fix ubuntu build warning, the config unused setter 2014-03-15 19:50:40 +08:00
winlin
010b5c0d7a fix ubuntu build warning, the config unused setter 2014-03-15 19:48:11 +08:00
winlin
48343e4f3a refien build script, regenereate all options. change to 0.9.12 2014-03-08 11:25:02 +08:00
winlin
880f4f5dc2 final the modularity, rename the app module. 2014-03-02 21:49:09 +08:00
Renamed from trunk/src/app/srs_core_config.cpp (Browse further)