external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity
4196 commits 13 branches 107 tags 375 MiB
Commit graph

1224 commits

Author SHA1 Message Date
winlin
a0890fe06a comment the pcr 2016-08-30 19:29:59 +08:00
winlin
bf22acd689 Merge branch '2.0release' into develop 2016-08-18 11:29:22 +08:00
winlin
f080537887 update readme 2016-08-18 11:28:54 +08:00
winlin
7df7156e07 Merge branch '2.0release' into develop 2016-08-17 10:12:34 +08:00
winlin
dbc6d94028 update readme. 2016-08-17 09:33:11 +08:00
winlin
abeb4f46a9 merge 2.0 2016-08-06 17:28:43 +08:00
winlin
007f7da50b release 2.0beta0, 2.0.10 2016-08-06 16:44:33 +08:00
winlin
ceb0187bd1 update readme 2016-05-17 10:58:09 +08:00
winlin
768cbd3a1a refine readme 2016-01-20 14:21:00 +08:00
winlin
6c80ecbbf9 update readme 2016-01-20 14:19:53 +08:00
winlin
27690f9e52 Merge branch '2.0release' into develop 2016-01-13 17:31:40 +08:00
winlin
b51cd599cc add linked in page. 2016-01-13 17:31:33 +08:00
winlin
28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 2016-01-13 12:44:51 +08:00
winlin
a11ab5ad24 merge from srs2. 2016-01-11 13:22:45 +08:00
winlin
e2e6e76f92 for #558 and #559, 2.0.208 2016-01-11 13:21:28 +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
384de15094 merge srs2 2015-12-23 10:18:18 +08:00
winlin
d3139c52cc release 2.0.205, 2.0-alpha3. 2015-12-23 09:58:17 +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
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
40457e6cab default hls_on_error to continue. 2.0.201 2015-12-15 16:02:02 +08:00
winlin
cafe886c3f merge srs2 2015-11-27 17:46:00 +08:00
winlin
34d1ce9922 update readme, add gitter. 2015-11-27 17:45:04 +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
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
a3a6282fe9 merge srs2. 2015-11-06 10:52:29 +08:00
winlin
a89ed68aa3 update readme for #511. 2015-11-06 10:51:32 +08:00
winlin
6e3eb50b78 Merge branch '2.0release' into develop 2015-11-02 13:51:07 +08:00
winlin
6d0adb9f22 fix typo 2015-11-02 13:51:01 +08:00
winlin
57536bf428 fix typo in readme. 2015-11-02 13:47:56 +08:00
winlin
2b21a63d8f merge from srs2. 2015-11-02 13:43:22 +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
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
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
9a47390253 fix #467, support write log to kafka. 3.0.6 2015-10-23 14:42:04 +08:00
winlin
d115f53770 merge from srs2 2015-10-20 16:41:59 +08:00
winlin
95d38b7b29 update realease 2015-10-20 16:01:26 +08:00
winlin
bd208c762d update readme 2015-10-20 15:58:10 +08:00
winlin
29122b6e70 fix #502, transcoder support snapshot. 2015-10-20 14:52:34 +08:00
winlin
320f126b7e release srs 2.0 alpha2, 2.0.195 2015-10-08 09:27:25 +08:00
winlin
fbff42b33a release srs 2.0 alpha2, 2.0.195 2015-10-08 09:27:04 +08:00
winlin
6d488541bd release srs 2.0 alpha2, 2.0.195 2015-10-08 09:26:04 +08:00
winlin
56412edb5f release srs 2.0 alpha2, 2.0.195 2015-10-08 09:25:28 +08:00
winlin
1675c4b721 release srs 2.0 alpha2, 2.0.195 2015-10-08 09:19:30 +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
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
d94a88a797 merge from srs2 for pi and cubie. 2015-09-23 11:23:55 +08:00
winlin
6990508e58 for #485, srs for respberrypi and cubieboard. 2.0.191 2015-09-23 11:05:56 +08:00
winlin
874ae85e47 update readme. 2015-09-21 14:26:31 +08:00
winlin
22d6ec4f93 update readme. 2015-09-21 14:24:06 +08:00
winlin
841d9ee5ad update readme. 2015-09-21 14:20:30 +08:00
winlin
f07d7dcf35 update readme. 2015-09-21 14:19:07 +08:00
winlin
ddb0dcdcaa update readme. 2015-09-21 14:13:07 +08:00
winlin
99e27c035a update readme. 2015-09-21 13:52:16 +08:00
winlin
0fb353f1f6 update readme. 2015-09-21 13:50:01 +08:00
winlin
e5581981d4 Merge branch '2.0release' into develop 2015-09-21 13:39:15 +08:00
winlin
534a8c9fa3 update readme. 2015-09-21 13:39:08 +08:00
winlin
bbbb4e5025 update readme. 2015-09-21 13:37:42 +08:00
winlin
e5429fef02 update readme. 2015-09-21 13:34:28 +08:00
winlin
a6377fe456 refine readme 2015-09-21 13:26:08 +08:00
winlin
533b9a5cfb Merge branch '2.0release' into develop 2015-09-21 13:24:34 +08:00
winlin
87d007d087 refine readme 2015-09-21 13:24:29 +08:00
winlin
f42cd55078 refine readme 2015-09-21 13:24:05 +08:00
winlin
2d99e8a563 refine readme 2015-09-21 13:20:04 +08:00
winlin
d129c1079b refine readme 2015-09-21 13:19:32 +08:00
winlin
21fa01d706 refine readme 2015-09-21 13:19:06 +08:00
winlin
03c2884f8c refine readme 2015-09-21 13:17:54 +08:00
winlin
c90e117bbf refine readme 2015-09-21 12:41:45 +08:00
winlin
d98fc58e8b refine readme 2015-09-21 12:32:14 +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
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
8a90e76637 fix #459, support dvr raw api. 3.0.4 2015-09-15 23:00:00 +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
95979674f9 merge srs 2 2015-09-14 21:09:34 +08:00
winlin
2c21f74efb update readme. 2015-09-14 21:08:19 +08:00
winlin
a865eb9ccb merge from srs2 2015-09-14 20:58:54 +08:00
winlin
1d477ae71b srs 2.0 alpha1 released. 89269 lines. 2015-09-14 20:48:32 +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
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
ad6de898a5 Merge branch '2.0release' into develop 2015-09-14 09:29:09 +08:00
winlin
d07bfa459a update donation 2015-09-14 09:28:47 +08:00
winlin
1518ea6142 update donation 2015-09-13 18:15:51 +08:00
winlin
589d430086 Update README.md 2015-09-13 18:14:56 +08:00
winlin
61d817bad5 Update README.md 2015-09-13 18:07:26 +08:00
winlin
f9228464b6 update donation 2015-09-13 17:59:37 +08:00
winlin
f09019ea0d update donation 2015-09-13 17:57:40 +08:00
winlin
77d21f7e32 refine readme, fix typo 2015-09-11 08:02:45 +08:00
winlin
6931bdd6d5 refine readme, the module and arch 2015-09-11 08:00:16 +08:00
winlin
d76eda35ab refine readme, add exec for stream arch 2015-09-11 07:47:40 +08:00
winlin
a0c6e4ee8c refine readme, add exec for stream arch 2015-09-11 07:47:08 +08:00
winlin
9d85025114 Update README.md 2015-09-11 07:38:58 +08:00
winlin
db1ed513be Update README.md 2015-09-11 07:37:57 +08:00
winlin
d56b9fd90f refine readme 2015-09-11 07:35:42 +08:00
winlin
abd7ee227c support reload utc_time. 2.0.186 2015-09-09 23:37:07 +08:00
winlin
11c409688b for #319, http raw api support query. 3.0.3 2015-08-31 23:34:03 +08:00
winlin
5efd1912f2 refine readme 2015-08-28 22:21:18 +08:00
winlin
871ac95c2e merge from srs 2 2015-08-28 18:49:41 +08:00
winlin
0221434ae9 refine links 2015-08-28 18:48:35 +08:00
winlin
166e487d24 refine links 2015-08-28 18:47:39 +08:00
winlin
f3b4f2bc53 refine readme for links 2015-08-28 18:29:46 +08:00
winlin
7f2bbcb248 refine readme links. 2015-08-28 18:26:25 +08:00
winlin
c290951d20 merge from srs2 2015-08-28 18:18:49 +08:00
winlin
cf48559752 refine the readme. 2015-08-28 18:17:56 +08:00
winlin
1b1a2a1e63 fix #471, api response the width and height. 3.0.2 2015-08-28 18:00:24 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
5e48dab2b9 Merge branch '2.0release' into develop 2015-08-23 09:57:07 +08:00
winlin
21b175b4db add remote console to feature list. 2015-08-23 09:57:04 +08:00
winlin
ce1627eb34 Merge branch '2.0release' into develop 2015-08-23 09:55:46 +08:00
winlin
899ecb5661 add remote console to feature list. 2015-08-23 09:55:41 +08:00
winlin
8d2b2d0148 Merge branch '2.0release' into develop 2015-08-23 09:39:23 +08:00
winlin
ada33bdad7 add srs 1.0release time 2015-08-23 09:39:16 +08:00
winlin
b4040a5fc9 Merge branch '2.0release' into develop 2015-08-23 09:11:38 +08:00
winlin
724498bb09 update 2.0 release file to srs2.0a0 2015-08-23 09:11:32 +08:00
winlin
7e475e15b0 release 2.0a0 2015-08-23 09:00:57 +08:00
winlin
28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185 2015-08-23 09:00:21 +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
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
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +08:00
winlin
22491b0c99 merge from 2.0 2015-08-19 14:21:12 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +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
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
a64340c2b5 Merge branch '2.0release' into develop 2015-08-13 21:58:08 +08:00
winlin
c02da33c11 add bytes api benchmark. 2015-08-13 21:57:18 +08:00
winlin
035cd40866 add bytes api benchmark. 2015-08-13 21:55:05 +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
267846a3fa for #442, support kickoff connected client. 2.0.181 2015-08-12 13:20:18 +08:00
winlin
6a39bf4731 refine for srs3 2015-08-11 15:52:25 +08:00
winlin
34fe51a85c refine for 2.0release 2015-08-11 15:51:56 +08:00
winlin
0e3128d3e3 Merge branch '2.0release' into develop 2015-08-03 15:23:07 +08:00
winlin
a62d1cdf2a refine the readme 2015-07-30 17:47:40 +08:00
winlin
de64f6829d update readme 2015-07-27 14:14:59 +08:00
winlin
3d5fbc7a61 update README, remove the 1.0history. 2015-07-27 14:13:12 +08:00
winlin
4c3d3013a2 Merge branch '2.0release' into develop 2015-07-23 14:35:04 +08:00
winlin
cd8be3f194 Update README.md 2015-07-23 14:34:22 +08:00
winlin
fb46481fc7 Update README.md 2015-07-23 14:30:58 +08:00
winlin
9e6746fcaa Update README.md 2015-07-23 14:29:37 +08:00
winlin
94569b181f merge from 2.0 2015-07-21 12:08:05 +08:00
winlin
c85f92c229 fix #169, support default values for transcode. 2.0.180 2015-07-21 12:07:26 +08:00
winlin
48c040c92b Merge branch '2.0release' into develop 2015-07-21 11:41:13 +08:00
winlin
89183c52c9 update hls and transcode wiki 2015-07-21 11:41:02 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
146a44a2ce merge from 2.0 2015-07-20 09:32:46 +08:00
winlin
b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 2015-07-20 09:31:46 +08:00
winlin
fdb17a1864 merge from 2.0 2015-07-17 14:06:15 +08:00
winlin
366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 2015-07-16 17:30:27 +08:00
winlin
8e293f927f merge 2.0release 2015-07-14 11:47:08 +08:00
winlin
5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 2015-07-14 11:46:23 +08:00
winlin
5f91fbc970 merge from 2.0release 2015-07-14 11:32:40 +08:00
winlin
ef5ddd01e4 Update README.md 2015-07-13 12:08:53 +08:00
winlin
c8fef99cb6 merge from 2.0release 2015-07-01 14:51:27 +08:00
winlin
438914c481 fix #433, fix the sps parse bug. 2.0.176 2015-07-01 14:50:45 +08:00
winlin
8951752086 Merge branch '2.0release' into develop 2015-06-17 16:47:08 +08:00
Jonathan Barratt
2e437a28b4 Update README.md 
Correct path in installation instructions since project repository renamed to srs from simple-rtmp-server
 2015-06-17 16:46:39 +08:00
winlin
b0ce38dc8f merge from 2.0 2015-06-10 15:38:44 +08:00
winlin
56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 2015-06-10 15:38:13 +08:00
winlin
12eab8a128 merge from srs2. 2015-06-10 13:53:57 +08:00
winlin
6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 2015-06-10 13:53:13 +08:00
winlin
5d75e32e1d Merge branch '2.0release' into develop 2015-06-06 21:24:06 +08:00
winlin
a1dd734318 fix #421, drop video for unkown RTMP header. 2015-06-06 21:23:57 +08:00
winlin
d10d57716a Merge branch '2.0release' into develop 2015-06-05 21:34:39 +08:00
winlin
26b76c0e4c fix #420, remove ts for hls ram mode. 2015-06-05 20:38:01 +08:00
winlin
9dce971d57 merge from srs2 2015-05-30 14:41:47 +08:00
winlin
223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 2015-05-30 14:41:09 +08:00
winlin
4a80a5a71e for #209, support cleanup when srs stop. 2015-05-30 13:48:29 +08:00
winlin
597993d414 support pure video hls. 2015-05-29 21:53:37 +08:00
winlin
5caafadd45 fix #409: support pure video hls. 2.0.172. 2015-05-29 21:43:17 +08:00
winlin
3ad030fe83 add HLS overload 2015-05-29 17:56:05 +08:00
winlin
27a1fee6b9 Merge branch '2.0release' into develop 2015-05-28 21:02:50 +08:00