Commit Graph

2003 Commits

Author SHA1 Message Date
winlin
c8466c36bd for #319, raw api support update the global RTMP chunk_size. 2015-09-01 21:27:04 +08:00
winlin
2cfb71616e for #319, copy all data to request for source. 2015-09-01 18:52:29 +08:00
winlin
2bdd974227 for #319, reorder the ingesters. 2015-09-01 18:41:30 +08:00
winlin
342483bf04 for #319, when reload the listen, restart all ingesters. 2015-09-01 18:39:14 +08:00
winlin
310b5a14cb for #319, support minimal query api 2015-09-01 13:33:49 +08:00
winlin
06c7ae62ee for #319, refine the error code for RAW APi. 2015-09-01 12:27:53 +08:00
winlin
11c409688b for #319, http raw api support query. 3.0.3 2015-08-31 23:34:03 +08:00
winlin
8a2709dd2c for #319, do not apply when config not changed. 2015-08-31 12:06:22 +08:00
winlin
a62c82bd46 for #319, api raw update global.listen 2015-08-30 23:42:21 +08:00
winlin
364460f2ab for #319, support raw update global.listen 2015-08-30 23:18:14 +08:00
winlin
f8d8c3ace4 use function to dumps the engine. 2015-08-30 23:08:27 +08:00
winlin
01878e5a9c for #319, query vhost detail. 2015-08-30 22:23:47 +08:00
winlin
b1b76a4a80 for #319, allow multiple ingest and transcode. 2015-08-30 14:52:12 +08:00
winlin
873aa7bf9f for #319, refine the query global, only show true options. 2015-08-30 12:16:26 +08:00
winlin
dc11013c01 for #319, render the detail of vhost 2015-08-30 10:17:39 +08:00
winlin
2b4fa2d73e for #319, move the edge configs to cluster. 2015-08-30 08:30:04 +08:00
winlin
6bd05f9cfc for #319, refine the config forward. 2015-08-30 07:59:25 +08:00
winlin
bc24c0407b for #319, move smi and rsh to play 2015-08-30 07:36:06 +08:00
winlin
f7c893d907 for #319, move gop_cache and queue_length to play 2015-08-30 07:26:55 +08:00
winlin
06ae74dd3f for #319, move mw_latency to play. 2015-08-30 07:05:57 +08:00
winlin
4eb1874955 for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency. 2015-08-30 06:49:20 +08:00
winlin
9c4340f789 for #319, move atc and atc_auto to play 2015-08-29 23:36:03 +08:00
winlin
d6b0aa3a5b for #319, move time_jitter and mix_correct to play 2015-08-29 23:18:25 +08:00
winlin
738642073e for #319, refine config, collect the mr and publish timeout 2015-08-29 22:41:50 +08:00
winlin
bc100c2867 refine the log, move default to each functions. 2015-08-29 19:46:56 +08:00
winlin
7ef3ff90c0 refine the config structure, compatible with SRS1/2 2015-08-29 18:40:18 +08:00
winlin
a79e19599c for #319, support query the vhost info. 2015-08-29 16:12:30 +08:00
winlin
bdfd0ae09e for #319, dumps the http static, remux and globals. 2015-08-28 23:51:23 +08:00
winlin
1b1a2a1e63 fix #471, api response the width and height. 3.0.2 2015-08-28 18:00:24 +08:00
winlin
04bea781ca use amf0 encode for json encode. 2015-08-28 15:11:11 +08:00
winlin
e0219bd7aa refine code, merge json encode to amf0. 2015-08-28 14:39:29 +08:00
winlin
66ffcad635 for #319, always allow raw query. 2015-08-28 13:17:46 +08:00
winlin
f167616379 rename the config_query to query 2015-08-28 13:01:04 +08:00
winlin
75ca759e5d fix the reload http api bug. 2015-08-28 12:38:09 +08:00
winlin
2dcf3bc606 for #319, support rpc raw api to query the HTTP RAW API configs. 2015-08-28 12:28:18 +08:00
winlin
af0a76e51a fix the build failed bug on centos 2015-08-28 00:03:10 +08:00
winlin
e03d8a0115 fix the build failed bug on centos 2015-08-28 00:01:19 +08:00
winlin
555a3fbf5f for #319, support render HTTP RAW API in console. 2015-08-27 23:55:59 +08:00
winlin
8e635d9749 for #319, support HTTP RAW API config_query global data. 2015-08-27 22:46:56 +08:00
winlin
d921d59e57 for #319, support HTTP RAW API reload. 2015-08-27 18:11:50 +08:00
winlin
f74dc62046 fix the process restart bug. 2015-08-26 23:20:19 +08:00
winlin
e39e006d63 fix the exec clear bug. 2015-08-26 23:11:42 +08:00
winlin
c081a5370b Merge branch '2.0release' into develop 2015-08-26 23:03:01 +08:00
winlin
fe4cdceb15 always wait for process to terminated when SIGKILL. 2015-08-26 23:02:54 +08:00
winlin
1e0481a2d0 for #319, support signal to persistence config 2015-08-26 21:49:05 +08:00
winlin
980e3921e4 for #319, add signal to write config to file. 2015-08-26 21:11:28 +08:00
winlin
cdde293785 add todo for reload the source components. 2015-08-25 22:59:17 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
7de181004f Merge branch '2.0release' into develop 2015-08-25 11:55:44 +08:00
lovecat
9c2beffe8f statistic connection bytes before remove client. 2015-08-25 11:46:12 +08:00
winlin
039af7243c for #367, refine the comments for process. 2015-08-24 22:26:19 +08:00
winlin
6fe88d088c for #367, process support redirect stdout and stderr. 2015-08-24 22:19:57 +08:00
winlin
0e1861b084 for #367: extract the process from ffmpeg to exec programs. 2015-08-24 21:51:05 +08:00
winlin
a242aa35dc add pid to srs rtmp dump 2015-08-24 16:00:11 +08:00
winlin
28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185 2015-08-23 09:00:21 +08:00
winlin
5721bc371c Merge branch '2.0release' into develop 2015-08-23 00:01:11 +08:00
winlin
e43d4e46b4 support JSONP DELTE/POST/PUT 2015-08-23 00:01:03 +08:00
winlin
baa70d4ddd add nb_streams for vhost 2015-08-22 22:51:59 +08:00
winlin
7a2836ae2a Merge branch '2.0release' into develop 2015-08-22 19:49:39 +08:00
winlin
6e5143449e HTTP API support JSONP by specifies the query string callback=xxx. 2015-08-22 18:18:18 +08:00
winlin
22485ce5e9 Merge branch '2.0release' into develop 2015-08-22 13:57:45 +08:00
winlin
aeebddb269 for #442, add more information for client for api. 2015-08-22 13:57:34 +08:00
winlin
94641c812b fix #442, support kickoff client. 2015-08-22 13:36:15 +08:00
winlin
b37797b13a for #442, add publish connection in stream.publish api 2015-08-22 13:03:10 +08:00
winlin
529803ed04 refine code for api. 2015-08-22 12:38:14 +08:00
winlin
1962449770 Merge branch '2.0release' into develop 2015-08-22 11:09:11 +08:00
winlin
6b6d951298 add api /api/v1/features 2015-08-22 11:08:56 +08:00
winlin
4763f205a2 add kbps for vhost and stream 2015-08-22 09:49:38 +08:00
winlin
0a4d78383c Merge branch '2.0release' into develop 2015-08-21 17:15:42 +08:00
winlin
20a8818a8e refine the error response. 2015-08-21 17:15:32 +08:00
winlin
2edcf1d4ff support query specified vhost 2015-08-21 17:00:52 +08:00
winlin
66a26bdce8 move json from app to protocol 2015-08-21 16:20:19 +08:00
winlin
a7589b9ad3 refine code for api, add clients and parse_rest_id 2015-08-21 16:12:48 +08:00
winlin
ab4620870d refine the stat api, support query specified stream. 2015-08-21 15:51:20 +08:00
winlin
32a484164a Merge branch '2.0release' into develop 2015-08-21 15:22:46 +08:00
winlin
c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection. 2015-08-21 15:22:40 +08:00
winlin
9528243b81 Merge branch '2.0release' into develop 2015-08-21 13:43:40 +08:00
winlin
3c402cb908 refine the tcp nodelay, effect connected connections. 2015-08-21 13:43:33 +08:00
winlin
71aacebcbc Merge branch '2.0release' into develop 2015-08-21 12:08:35 +08:00
winlin
c31a546eec support vhost for http flv. 2015-08-21 12:08:25 +08:00
winlin
77765b463a Merge branch '2.0release' into develop 2015-08-20 14:20:58 +08:00
winlin
575a698820 fix #380, srs-librtmp send sequence header when sps or pps changed. 2015-08-20 14:20:49 +08:00
winlin
f10e399991 Merge branch '2.0release' into develop 2015-08-19 19:02:40 +08:00
winlin
ec87dd9cd6 refine code for srs rtmp dump 2015-08-19 19:02:33 +08:00
winlin
785a5907a8 set the default get_publish_normal_timeout to 5s 2015-08-19 16:27:22 +08:00
winlin
0bbfc5526a set the default get_publish_normal_timeout to 5s 2015-08-19 16:22:52 +08:00
winlin
7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 2015-08-19 16:16:05 +08:00
winlin
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +08:00
winlin
a5dd3a8e7b Merge branch '2.0release' into develop 2015-08-19 15:14:35 +08:00
winlin
e7714cd445 add packets interval in ms to set the right send_min_interval 2015-08-19 15:14:26 +08:00
winlin
de48b477ae drop the metadata when drop sequence header 2015-08-19 14:23:12 +08:00
winlin
22491b0c99 merge from 2.0 2015-08-19 14:21:12 +08:00
winlin
f691dddc1a drop metadata when drop sequence header. support PCUC 0x1a 2015-08-19 14:20:31 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +08:00
winlin
0cb7ddfe8c Merge branch '2.0release' into develop 2015-08-18 14:09:05 +08:00
winlin
ccc4c05da9 fix #229, support vs2010 for srslibrtmp. 2015-08-18 14:08:54 +08:00
winlin
f53b2556bb Merge branch '2.0release' into develop 2015-08-17 16:34:21 +08:00
winlin
01be68fe58 refine code, donot remove the detail when hls disabled. 2015-08-17 16:34:11 +08:00
winlin
53351cd645 Merge branch '2.0release' into develop 2015-08-14 15:51:15 +08:00
winlin
afd05f71c3 refine code, use size cache for performance issue. 2015-08-14 15:51:02 +08:00