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

3116 commits

Author SHA1 Message Date
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
b881166f9a merge from srs2 2015-12-22 16:18:09 +08:00
winlin
c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 2015-12-22 16:13:49 +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
e124aeb614 Merge branch '2.0release' into develop 2015-12-15 16:25:27 +08:00
winlin
69d191e53f refine the hls error log. 2015-12-15 16:25:21 +08:00
winlin
0ab64ccd2a merge from srs2. 2015-12-15 16:06:40 +08:00
winlin
40457e6cab default hls_on_error to continue. 2.0.201 2015-12-15 16:02:02 +08:00
winlin
f6ff116505 refine code, persistence use isolate method. 2015-12-15 14:27:49 +08:00
winlin
b486f6fe6b refine /api/v1/summaries, with code and server id. 2015-12-15 12:46:47 +08:00
winlin
26d328e7f2 fix bug for api, level should be string. 2015-12-14 18:43:20 +08:00
winlin
ffef3905af merge from srs2. 2015-12-11 11:35:56 +08:00
winlin
5660e24953 fast stop server. 2015-12-11 11:30:36 +08:00
winlin
2830ee12c1 fix the on_hls.ts_url bug. 2015-12-11 11:29:10 +08:00
winlin
1e4c8f8bf3 fast stop server. 2015-12-11 10:30:13 +08:00
winlin
3ab5892863 refine comments. 2015-12-10 18:02:23 +08:00
winlin
5ac8177ce6 fix bugs 2015-12-08 18:32:37 +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
winlin
17bb31cab1 fix the config bug. 2015-12-04 15:22:13 +08:00
winlin
eec2c34b5c refine publisher. 2015-12-01 10:42:13 +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
18eb8c81b3 merge from srs2 2015-11-16 18:10:06 +08:00
winlin
2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 2015-11-16 18:06:44 +08:00
YueHonghui
eb4ca9ff5d fix bug of fd leek in srs_app_server 2015-11-16 15:47:17 +08:00
winlin
c77cefb6fa refine the position of log script 2015-11-11 17:49:46 +08:00
winlin
44b26271bf Merge branch '2.0release' into develop 2015-11-11 17:12:34 +08:00
winlin
c4c63f7825 fix build failed bug for osx. 2015-11-11 17:06:12 +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
6c7a51d310 Merge branch '2.0release' into develop 2015-11-10 12:16:08 +08:00
winlin
1d8318d2fc change simple-rtmp-server org to ossrs 2015-11-10 12:16:01 +08:00
winlin
d2ccc4f661 Merge branch '2.0release' into develop 2015-11-10 12:15:00 +08:00
winlin
8c04b17d08 use /usr/local/bin for osx. 2015-11-10 12:03:52 +08:00
winlin
7db7d43aea Merge branch '2.0release' into develop 2015-11-09 15:25:55 +08:00
winlin
18b50d961f support query server by id. 2015-11-09 15:19:50 +08:00
winlin
aca9fe805c Merge branch '2.0release' into develop 2015-11-09 14:51:47 +08:00
winlin
d916c53702 refine the api server. 2015-11-09 14:51:41 +08:00
winlin
a89ed68aa3 update readme for #511. 2015-11-06 10:51:32 +08:00
winlin
75be18133d fix build failed for utest. 2015-11-06 10:26:18 +08:00
winlin
6df4d1f05a merge from srs2. 2015-11-05 15:12:49 +08:00
winlin
98e25def6c fix utest build failed for osx. 2015-11-05 15:11:59 +08:00
winlin
97f5bb8b99 merge from srs2 2015-11-05 14:48:25 +08:00
zhengfl
38b81ce312 允许操作SrsStream中的函数时，长度为0. 2015-11-05 14:37:21 +08:00
zhengfl
1dae8fc987 fix #511, fix the bug of thread stop invalid. 2015-11-05 13:52:59 +08:00
winlin
49d77b3f09 for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 2015-11-02 13:42:05 +08:00
winlin
4b5eb5ea2d fix the parse rtmp url bug for ingest. 2015-11-02 13:37:44 +08:00
winlin
ec225b2108 quit child process when fork failed. 2015-11-02 11:46:33 +08:00
winlin
9d7826c681 quit child process when fork failed. 2015-11-02 11:44:22 +08:00
winlin
f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 2015-11-02 11:29:20 +08:00
winlin
f4f76cd196 for #515, use SrsAutoFreeA to free the array. 2015-11-02 11:26:37 +08:00
winlin
604486b0a3 for #515, use srs_freepa to free array. 2015-11-02 11:11:49 +08:00
winlin
8cec06e898 merge srs2, use srs_freepa for array 2015-11-02 11:05:39 +08:00
winlin
2af7749771 for #515, use srs_freepa to free the array. 2015-11-02 11:02:27 +08:00
winlin
cef1ae5a8e fix the config bug. 2015-10-28 12:55:16 +08:00
winlin
9ebb77d711 fix the warnings 2015-10-28 11:58:49 +08:00
winlin
e9e202dbf1 merge srs2 2015-10-28 11:51:32 +08:00
winlin
ef00005ab4 for ExoPlayer, remove duration for live. 2015-10-28 11:51:03 +08:00
winlin
8c96472cea merge srs2 2015-10-28 11:03:15 +08:00
winlin
50a7b9c1ff for ExoPlayer, add av tag in flv header. 2.0.197 2015-10-28 11:01:20 +08:00
winlin
59f5c5d6a5 Merge branch '2.0release' into develop 2015-10-27 18:21:04 +08:00
winlin
3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 2015-10-27 18:20:57 +08:00
winlin
390f58e186 fix compile failed. 2015-10-27 17:57:58 +08:00
winlin
a416e891b4 fix compile failed. 2015-10-27 17:54:07 +08:00
winlin
1d57e53910 merge from 2.0release 2015-10-27 17:45:14 +08:00
winlin
d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 2015-10-27 17:44:10 +08:00
winlin
3683f06e4d for #512, write audio frame by frame for video+audio hls. 2015-10-27 16:20:02 +08:00
winlin
fe27e76492 support schema 2015-10-26 18:34:55 +08:00
winlin
a501f5bd7a update htbt script 2015-10-26 14:54:41 +08:00
winlin
dd2945add1 update htbt script 2015-10-26 14:53:54 +08:00
winlin
6f6d495a19 update htbt script 2015-10-26 14:50:16 +08:00
winlin
3933819686 add htbt script 2015-10-26 14:18:19 +08:00
winlin
0a8cb8a391 add heartbeat script 2015-10-26 14:17:24 +08:00
winlin
11979229e6 Merge branch '2.0release' into develop 2015-10-26 13:34:44 +08:00
winlin
e08beba89e fix the sed command for arm 2015-10-26 13:34:28 +08:00
winlin
45385241bb fix the sed command for arm 2015-10-26 13:29:59 +08:00
winlin
b8f2ba4f0d complete kafka 2015-10-23 14:42:05 +08:00
winlin
cbe4252b4d refine code. 2015-10-23 14:42:04 +08:00
winlin
d2ca51ac50 notify kafka when client close 2015-10-23 14:42:04 +08:00
winlin
71451878c9 refine kafka, simplify code. 2015-10-23 14:42:04 +08:00
winlin
9a47390253 fix #467, support write log to kafka. 3.0.6 2015-10-23 14:42:04 +08:00
winlin
76cd3f8749 kafka convert json to producer message. 2015-10-23 14:42:04 +08:00
winlin
8e344f1c26 add producer api messages. 2015-10-23 14:42:04 +08:00
winlin
7a0aaf5900 kafka refine code 2015-10-23 14:42:04 +08:00
winlin
f9f5b56951 kakfa erase messages when wrote. 2015-10-23 14:42:04 +08:00
winlin
22fa9a0f1f kafka use temp transport to fetch metadata. 2015-10-23 14:42:04 +08:00
winlin
531b658f8e retry when metadata empty 2015-10-23 14:42:04 +08:00
winlin
61486a82aa kafka use topic and partition cache 2015-10-23 14:42:04 +08:00
winlin
7013993c7a kafka send the accept message. 2015-10-23 14:42:04 +08:00
winlin
de41c1c9d2 kafka refine comments. 2015-10-23 14:42:04 +08:00
winlin
31a77a83ed convert metadata to partitions 2015-10-23 14:42:04 +08:00
winlin
f0e39cc330 support show the summary of kafka metadata. 2015-10-23 14:42:04 +08:00
winlin
d013374871 rename ISrsCodec size to nb_bytes. 2015-10-23 14:42:03 +08:00
winlin
33a015329d add function to convert kafka array to vector 2015-10-23 14:42:03 +08:00
winlin
84b3981d47 refs #1670: support decode the metadata response. 2015-10-23 14:42:03 +08:00
winlin
7106934c3a kafka producer use async interface to request metadata. 2015-10-23 14:42:03 +08:00
winlin
a108fa8d01 kafka recv and decode message. 2015-10-23 14:42:03 +08:00
winlin
493d282255 kafka refine array, to decode and create object. 2015-10-23 14:42:03 +08:00
winlin
c4862878d1 kafka rename message set to raw message set. 2015-10-23 14:42:03 +08:00
winlin
6e5ed11a00 for kafka, support correlation id cache. 2015-10-23 14:42:03 +08:00
winlin
2e67eb8786 refine comments for kafka messages. 2015-10-23 14:42:03 +08:00
winlin
3c64e4b957 kafka encode and send packet. 2015-10-23 14:42:03 +08:00
winlin
9117e1e918 extract ISrsCodec for code and decode object. 2015-10-23 14:42:03 +08:00
winlin
45755fd1e7 refine code for kakfa request/response, string/bytes. 2015-10-23 14:42:03 +08:00
winlin
8a4ec49064 add graph comments for size of request and response. 2015-10-23 14:42:03 +08:00
winlin
8974fe298b connect to kafka and send metadata request. 2015-10-23 14:42:03 +08:00
winlin
a9fdb630d9 refine code, replace all rtmp connect by simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
a08d8f83d6 refine mpegts code, use simple rtmp client 2015-10-23 14:42:02 +08:00
winlin
ad9b377d96 refine forwarder code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
0f4cb8ee00 refine code, remove the rtmp recv/send macro, use one macro. 2015-10-23 14:42:02 +08:00
winlin
12e013142d refine code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
bc27481886 refine code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
e4c852945f refine code, support override vhost 2015-10-23 14:42:02 +08:00
winlin
a9ad7b211b refine simple rtmp client for post flv stream. 2015-10-23 14:42:02 +08:00
winlin
adb8f243bf use simple rtmp client for raw connect app 2015-10-23 14:42:02 +08:00
winlin
24b3899972 use SrsTcpClient instead raw socket. 2015-10-23 14:42:02 +08:00
winlin
a9bb6061c3 use tcp client for raw connect. 2015-10-23 14:42:02 +08:00
winlin
20fcfb3eee fix bug, use system utility 2015-10-23 14:42:02 +08:00
winlin
69cc01b696 use system utilities 2015-10-23 14:42:02 +08:00
winlin
908365a61a use string for const char* 2015-10-23 14:42:02 +08:00
winlin
d9f991ed2f use system utility for string finds 2015-10-23 14:42:02 +08:00
winlin
ca73534d7e refine comments for api key 2015-10-23 14:42:01 +08:00
winlin
29122b6e70 fix #502, transcoder support snapshot. 2015-10-20 14:52:34 +08:00
winlin
2bae6e09d3 for #502, snapshot 1 image per 1 seconds, choose best from 5 images. 2015-10-20 14:10:14 +08:00
winlin
1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png 2015-10-20 13:38:03 +08:00
winlin
33a282e576 support snapshot by http hooks for #152. 2015-10-20 12:30:57 +08:00
winlin
9eebb89432 Merge branch '2.0release' into develop 2015-10-20 10:17:54 +08:00
winlin
91e9fc7e5b fix typo of INVLIAD to INVALID 2015-10-20 10:17:48 +08:00
winlin
57a3b11b86 merge from srs2 2015-10-13 11:48:02 +08:00
winlin
5de65d41f4 Merge pull request #499 from synote/2.0release 
fix bug for build failure when configure with --log-info
 2015-10-12 10:07:08 +08:00
winlin
b5ba1043e8 Merge branch '2.0release' into develop 2015-10-08 16:07:54 +08:00
winlin
9c2eafc244 refine the git command 2015-10-08 15:53:49 +08:00
winlin
ed80d9d281 merge from srs2 2015-10-04 08:10:57 +08:00
winlin
0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 2015-10-04 08:09:39 +08:00
winlin
6587c5b2f1 merge from srs2 2015-10-01 13:22:51 +08:00
winlin
7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 2015-10-01 13:20:13 +08:00
winlin
8862ec1988 merge from srs2 2015-10-01 13:05:25 +08:00
winlin
a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 2015-10-01 13:04:28 +08:00
winlin
070ada1d6e Merge branch '2.0release' into develop 2015-10-01 12:30:55 +08:00
winlin
65e4bf2e77 fix compile failed bug. 2015-10-01 12:30:38 +08:00
winlin
d8f18aee37 use the right int type for port. 2015-09-24 18:33:07 +08:00
winlin
1c7d5f1852 Merge branch '2.0release' into develop 2015-09-24 17:55:33 +08:00
winlin
353e3260b8 remove duplicated code 2015-09-24 17:55:27 +08:00
winlin
9ead08725d use kernel utility int2str and float2str 2015-09-24 17:54:58 +08:00
winlin
6efd2dd27e add load balance round robin for brokers. 2015-09-24 17:20:04 +08:00
winlin
2a4ab8a923 add brokers to config 2015-09-24 14:53:22 +08:00
winlin
f187a7deef refine the startup logs. 2015-09-24 12:15:12 +08:00
winlin
3ab0ccaa27 Merge branch '2.0release' into develop 2015-09-23 18:23:17 +08:00
winlin
7cdcf41d26 refine the api server 2015-09-23 18:23:09 +08:00
winlin
afd6428366 refine code of server. 2015-09-23 17:21:57 +08:00
winlin
8b6c78b862 Merge branch '2.0release' into develop 2015-09-23 16:42:47 +08:00
winlin
d1de097f5e fix make clean bug, donot rm when no dir 2015-09-23 16:42:41 +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
4e88262512 merge from srs2 to check cpus. 2015-09-23 15:11:33 +08:00
winlin
cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 2015-09-23 15:09:59 +08:00
winlin
f6e655396c for #485, support cross build for arm 2015-09-23 11:54:53 +08:00
winlin
d94a88a797 merge from srs2 for pi and cubie. 2015-09-23 11:23:55 +08:00
winlin
16730ea031 refine code for cross build 2015-09-23 11:21:51 +08:00
winlin
6990508e58 for #485, srs for respberrypi and cubieboard. 2.0.191 2015-09-23 11:05:56 +08:00
winlin
f75058413d Merge branch '2.0release' into develop 2015-09-23 10:39:24 +08:00
winlin
7dcdb18588 support build on pi and cubie 2015-09-23 10:27:57 +08:00
winlin
a8829e0a8b support build on pi or cubie. 2015-09-23 10:22:58 +08:00
winlin
9a9483e7d5 support without kafka 2015-09-22 17:46:07 +08:00
winlin
abb5c5ad31 add kafka producer 2015-09-22 17:40:05 +08:00
winlin
b5ccc35340 add kafka config 2015-09-22 15:10:43 +08:00
winlin
ab1e62a886 create the metadata request message 2015-09-22 14:33:17 +08:00
winlin
ca3b89aa7d add kafka array, use c++ template. 2015-09-22 14:09:24 +08:00
winlin
8a6edac4e8 add --x86-64 alias for --x86-x64. 2015-09-22 13:52:14 +08:00
winlin
edead21a25 refine the options 2015-09-22 12:51:29 +08:00
winlin
e415824576 refine the options 2015-09-22 12:43:22 +08:00
winlin
2d5cc7a3e4 add structures for kafka 2015-09-22 12:38:07 +08:00
winlin
83f40697e2 refine the hpp macro defines. 2015-09-22 09:15:51 +08:00
winlin
df6ac8842c rename rtmp utility to protocol utility 2015-09-22 09:11:07 +08:00
winlin
82ff05c1d4 rename rtmp io to protocol io 2015-09-22 09:07:07 +08:00
winlin
168625dce2 rename rtmp amf0 to protocol amf0. 2015-09-22 09:05:21 +08:00
winlin
1310c0f577 rename srs_protocol_buffer to srs_protocol_stream 2015-09-22 09:02:37 +08:00
winlin
d32632ee8a rename SrsFastBuffer to SrsFastStream 2015-09-22 09:01:47 +08:00
winlin
4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 2015-09-22 08:59:52 +08:00
winlin
dadfe101b4 rename SrsBitStream to SrsBitBuffer 2015-09-22 08:59:21 +08:00
winlin
0e52fc6d5b rename SrsStream to SrsBuffer 2015-09-22 08:57:31 +08:00
winlin
ca3577e11b rename temp to stream 2015-09-22 08:52:00 +08:00
winlin
f33d736442 rename kernel stream to buffer 2015-09-22 08:50:14 +08:00
winlin
a4f51564db rename kernel stream to buffer 2015-09-22 08:48:55 +08:00
winlin
495f575ac3 rename kernel buffer to temp 2015-09-22 08:43:56 +08:00
winlin
ac2b03a3ed rename srs_kernel_buffer to temp 2015-09-22 08:42:54 +08:00
winlin
faf6d15878 add replace script. 2015-09-21 18:32:17 +08:00
winlin
1de2bb0801 add kafka protocol files. 2015-09-21 17:12:28 +08:00
winlin
b5996567e8 refine the role of srs, to cluster. 2015-09-21 12:09:09 +08:00
winlin
e4e36a0166 merge from srs2, fix openssl build 2015-09-21 12:03:47 +08:00
winlin
d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 2015-09-21 12:01:48 +08:00
winlin
b471c6e61c refine code, use json integter rather than number. 2015-09-19 14:40:32 +08:00
winlin
c5cd58761c move the srs thread to st. 2015-09-19 13:46:55 +08:00
winlin
3042115385 refine json to_str to dumps. 2015-09-19 13:37:56 +08:00
winlin
b59d9ba6a1 support amf0 and json to convert with each other. 2015-09-19 13:31:57 +08:00
winlin
3f7e69b617 json objects support dumps to string. 2015-09-19 12:27:31 +08:00
winlin
b78781707e update the srs player 2015-09-17 18:07:02 +08:00
winlin
5073a6fa08 merge from srs2 2015-09-17 18:06:03 +08:00
winlin
225e742657 add args3 2015-09-17 14:03:25 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
没——问题
e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
 2015-09-17 12:09:29 +08:00
winlin
7b2b11e932 async call worker fast execute tasks. 2015-09-17 11:57:17 +08:00
没——问题
c548ab5019 function set_srs_player_url(url, params) 
在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。

所以在此处提供设置 srs_player.swf 的url的方法。
 2015-09-17 11:44:45 +08:00
winlin
087f7740b7 fix the build failed bug 2015-09-17 11:41:23 +08:00
winlin
256459e1ec fix the utest bug 2015-09-17 11:37:35 +08:00
winlin
240a1bfadb rename kafka protocol 2015-09-16 13:56:52 +08:00
winlin
c4e4711b93 add kafka protocol 2015-09-16 13:55:11 +08:00
winlin
8a90e76637 fix #459, support dvr raw api. 3.0.4 2015-09-15 23:00:00 +08:00
winlin
2b9869ee52 update the wiki for dvr 2015-09-15 17:58:35 +08:00
winlin
2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 2015-09-15 15:58:57 +08:00
winlin
8f9cfcdcf4 fix #319, http raw api support update global and vhost. 3.0.4 2015-09-15 13:03:18 +08:00
winlin
e8a00de4a3 for #319, support enable or disable vhost. 2015-09-15 12:51:14 +08:00
winlin
631e76cd32 for #319, support update and delete the disabled vhost 2015-09-15 12:15:18 +08:00
winlin
a7c4b786cf merge from 2.0 2015-09-14 18:42:31 +08:00
winlin
511627abab fix #474, config to donot parse width/height from sps. 2.0.189 2015-09-14 18:36:44 +08:00
winlin
eb578b4a39 refine the thread, set to disposed when terminate normally 2015-09-14 17:17:38 +08:00
winlin
83a9ff9f5d for #474, refine the hls publish, donot fetch from source when publish 2015-09-14 15:49:25 +08:00
winlin
44bcb4045f for #474, decode the sequence header before hls. 2015-09-14 15:32:09 +08:00
winlin
07ef8160a3 clear the queue when edge republish. 2015-09-14 15:25:01 +08:00
winlin
704624c9ec clear the queue when edge republish. 2015-09-14 15:19:49 +08:00
winlin
8be3c875af donot release stream when busy 2015-09-14 15:17:59 +08:00
winlin
3da25f3aee when thread terminated normally, set the tid to NULL. 2015-09-14 15:11:49 +08:00
winlin
a994191ddc for #474, always release publish for source. 2015-09-14 15:10:34 +08:00
winlin
eb9aa47ab1 merge from 2.0 2015-09-14 13:48:27 +08:00
winlin
0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 2015-09-14 13:47:25 +08:00
winlin
3b483094bd merge from 2.0 2015-09-14 12:24:57 +08:00
winlin
6d50aa1aa2 #475, fix http hooks crash for st context switch. 2.0.187 2015-09-14 12:22:19 +08:00
winlin
adb74dc74e Merge branch '2.0release' into develop 2015-09-14 11:17:19 +08:00
winlin
f0fc093b19 fix the http zero content length bug. 2015-09-14 11:17:04 +08:00
winlin
01308ecc98 for #319, support initialize the parser to whether use jsonp 2015-09-12 22:22:33 +08:00
winlin
491ec11833 for #319, raw api support add new vhost 2015-09-12 21:55:53 +08:00
winlin
0d6c24581d refine json number, use int64 when number is int. 2015-09-12 16:36:29 +08:00
winlin
7ae76b579e refine the conf, use srs3 style 2015-09-11 08:21:06 +08:00
winlin
a88f321d8b for #319, merge from 2.0release 2015-09-09 23:41:11 +08:00
winlin
abd7ee227c support reload utc_time. 2.0.186 2015-09-09 23:37:07 +08:00
winlin
c4feb8f6ed for #319, raw api support update all globals. 2015-09-09 23:32:02 +08:00
winlin
6aafd072db for #319, raw api support update srs log tank, level and file. 2015-09-09 22:44:34 +08:00
winlin
8107e5f9a6 for #319, raw api support set the ff_log_dir 2015-09-09 21:46:29 +08:00
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
d1336e0d80 refine conf 2015-08-30 10:52:05 +08:00
winlin
dc11013c01 for #319, render the detail of vhost 2015-08-30 10:17:39 +08:00
winlin
0109a74840 for #319, refine the config structure. 2015-08-30 08:34:52 +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
synote
9b01aad220 fix bug for build failure when configure with --log-info 
wrong use of size in SrsStream::initialize of  srs_kernel_stream.cpp
 2015-08-28 11:43:55 +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
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