external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
3384 commits 13 branches 107 tags 375 MiB
Commit graph

2574 commits

Author SHA1 Message Date
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
53f4ce3604 for #367, update wiki to v3 2015-08-25 22:41:57 +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
3a8c03a471 Merge branch '2.0release' into develop 2015-08-24 16:00:41 +08:00
winlin
a242aa35dc add pid to srs rtmp dump 2015-08-24 16:00:11 +08:00
winlin
15102a7345 refine commit script 2015-08-24 11:16:39 +08:00
winlin
2a4b448cce Merge branch '2.0release' into develop 2015-08-24 11:04:48 +08:00
winlin
a7f4104d45 fix bug of commit script 2015-08-24 11:04:39 +08:00
winlin
d8030faabe Merge branch '2.0release' into develop 2015-08-24 10:59:39 +08:00
winlin
064031cac1 refine commit script 2015-08-24 10:59:32 +08:00
winlin
8e259eb0c2 refine the commit script 2015-08-24 10:57:12 +08:00
winlin
4118138cf0 update commit script 2015-08-24 10:54:31 +08:00
winlin
b25c45c643 refine srs player, support set the bufferTimeMax. 2015-08-24 07:55:30 +08:00
winlin
74d4c96423 for #367, design the config for exec. 2015-08-23 21:58:06 +08:00
winlin
cbfe438e73 for #367, design the config for exec. 2015-08-23 21:53:20 +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
0afe4963bc Merge branch '2.0release' into develop 2015-08-20 18:33:47 +08:00
winlin
dd21eee7f0 srs player show current time and url 2015-08-20 18:33:33 +08:00
winlin
ce8f446494 Merge branch '2.0release' into develop 2015-08-20 18:13:17 +08:00
winlin
dfecfb65b1 support fluency and stream empty count 2015-08-20 18:13:07 +08:00
winlin
fcd2d3d445 refine code for link generation from rtmp url. 2015-08-20 16:18:32 +08:00
winlin
fe87bf1b61 support generate link page for rtmp url 2015-08-20 16:11:17 +08:00
winlin
018af55d65 refine the demo pages, move scripts after body. 2015-08-20 15:19:43 +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
winlin
0b90af7e46 Merge branch '2.0release' into develop 2015-08-14 15:47:36 +08:00
winlin
3b0b2e0b85 fix the bug to support dump packets with count. 2015-08-14 15:47:29 +08:00
winlin
8d3d5dd10b Merge branch '2.0release' into develop 2015-08-14 14:35:47 +08:00
winlin
a0a89a8ca6 use reduce_sequence_header for stream control. 2015-08-14 14:35:41 +08:00
winlin
9fbff4b8f9 Merge branch '2.0release' into develop 2015-08-14 11:15:29 +08:00
winlin
b79d830e2c refine the default smi 2015-08-14 11:15:23 +08:00
winlin
807299589e merge from srs2. 2015-08-14 11:14:33 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
0b84c1d962 Merge branch '2.0release' into develop 2015-08-12 18:02:40 +08:00
winlin
7dcba040eb refine config. 2015-08-12 18:02:31 +08:00
winlin
653afd0700 merge from 2.0 2015-08-12 13:23:00 +08:00
winlin
9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 2015-08-12 13:22:09 +08:00
winlin
1261916eab refine the mount and dir to /console 2015-08-12 12:49:22 +08:00
winlin
b27bb48447 refine the version 2015-08-12 08:18:45 +08:00
winlin
eab538d2e4 fix the version of srs2 2015-08-11 18:37:50 +08:00
winlin
f28c9b7eb5 merge from 2.0release 2015-08-11 15:49:48 +08:00
winlin
3a6854fc2e refine code. 2015-08-11 15:36:14 +08:00
lovacat
e8c0ca7af0 fix #442: HTTP API kickoff client. 2015-08-11 15:23:46 +08:00
winlin
d761ebfa55 refine the api, move the requests and errors to rest. 2015-08-11 13:09:21 +08:00
winlin
c5bf397295 fix the http error header. 2015-08-10 16:41:25 +08:00
winlin
fbcc07d85a fix the typo of AUTIO. 2015-08-05 22:54:29 +08:00
winlin
0e3128d3e3 Merge branch '2.0release' into develop 2015-08-03 15:23:07 +08:00
winlin
65b2ed7ac5 refine code, move the order of functions. 2015-08-03 14:11:21 +08:00
winlin
71f2726b31 fix bug of merge code for reload http_remux for vhost 2015-08-03 13:44:24 +08:00