1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

203 commits

Author SHA1 Message Date
winlin
cbffe74494 add circleci 2016-09-15 14:15:49 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
fba1122835 private the srs_vhost_resolve 2015-12-07 10:15:08 +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
75be18133d fix build failed for utest. 2015-11-06 10:26:18 +08:00
winlin
f187a7deef refine the startup logs. 2015-09-24 12:15:12 +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
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
0e52fc6d5b rename SrsStream to SrsBuffer 2015-09-22 08:57:31 +08:00
winlin
a4f51564db rename kernel stream to buffer 2015-09-22 08:48:55 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
winlin
256459e1ec fix the utest bug 2015-09-17 11:37:35 +08:00
winlin
f7c893d907 for #319, move gop_cache and queue_length to play 2015-08-30 07:26:55 +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
d103557a8b merge the rtmp sdk to stack. 2015-06-13 16:04:59 +08:00
winlin
574cf6a094 use libfdk_aac for srs2. 2015-06-08 15:02:19 +08:00
winlin
5908096fc3 refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:04:28 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
eb54ec25c9 fix compile errors. 2015-04-03 11:30:59 +08:00
winlin
bbac2348db for #354, remove the double underscore functions and variables. 2015-03-21 11:55:28 +08:00
winlin
c6817cc422 for #354, remove the double underscore of macro. 2015-03-21 10:25:03 +08:00
wenjie.zhao
643f18abe4 add hds reload supported.#328 2015-03-12 22:38:11 +08:00
winlin
983ab8fb89 pass all utest for 2.0 2015-03-04 12:24:22 +08:00
winlin
3d47fbdc5c fix build failed of utest. 2015-03-04 09:18:15 +08:00
winlin
a4ba40952a for #250, rename rtmp to protocol dir. 2015-01-23 10:07:20 +08:00
winlin
5661fc2676 refine dvr and rtmp dump, write the original data. 2015-01-07 15:01:58 +08:00
winlin
0b9bbdbe74 Merge branch '1.0release' into develop 2015-01-03 13:30:13 +08:00
winlin
f9a33fbeee fix the compile failed for utest at 32bits cpus 2015-01-03 13:29:52 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
b77e1de1d1 fix bug of utest 2014-12-22 15:31:57 +08:00
winlin
f9b9a60de7 for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60 2014-12-05 23:03:52 +08:00
winlin
4d1c162ebd fix utest failed bug. 2014-12-04 22:28:33 +08:00
winlin
60bc9c2aa0 add performance header to control options for performance. 2.0.50 2014-12-04 13:43:55 +08:00
winlin
8423974e3b for bug #248, rename SrsBuffer to SrsFastBuffer. 2014-12-04 11:32:32 +08:00
winlin
ea0e837cd6 move the srs_kernel_buffer to srs_protocol_buffer. 2014-12-03 18:56:09 +08:00
winlin
565f29ed6c Revert "for bug #241, merge big chunks for publish, no use."
This reverts commit 6b57597718.
2014-12-02 22:26:20 +08:00
winlin
6b57597718 for bug #241, merge big chunks for publish, no use. 2014-12-02 22:26:04 +08:00
winlin
abb0fce3d8 fix bug for utest of message array, it does not free messages now. 2014-11-29 18:36:40 +08:00
winlin
23f4aa5737 for bug #235, fix bug of utest. 2014-11-29 18:33:43 +08:00
winlin
8845bb7caf for bug #194, refine code, remove the old duplicated code. 2014-11-13 16:56:41 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:28:50 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +08:00
winlin
6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:55:58 +08:00
winlin
624ab86fa2 fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid. 2014-09-27 13:14:46 +08:00
winlin
83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 2014-09-25 10:59:29 +08:00
winlin
9b6187c3d5 fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.207. 2014-08-22 13:10:11 +08:00
winlin
cb311d998e fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.206. 2014-08-22 12:47:50 +08:00
winlin
e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 2014-08-19 10:59:59 +08:00
winlin
cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 2014-08-16 19:59:14 +08:00
winlin
7adbe7f456 fix utest build failed, sync with src changed. 2014-08-08 10:47:55 +08:00
winlin
3532b61e3d open all utest macro 2014-08-05 09:16:45 +08:00
winlin
798f9139a4 add reload utest. 2014-08-05 09:16:25 +08:00
winlin
7b24788445 for bug #143, build on centos5. 2014-08-02 22:18:39 +08:00
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
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
e5e0c4a68d refine the utest, add stats 2014-07-27 15:00:52 +08:00
winlin
e76036f40b refine config heartbeat, add new stats. 0.9.175 2014-07-27 14:43:55 +08:00
winlin
13abb0d768 complete config utest. 0.9.173 2014-07-26 19:57:32 +08:00
winlin
a35d403651 add utest for config check 2014-07-26 17:14:14 +08:00
winlin
30ebba0673 add config check utest 2014-07-26 15:54:40 +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
9f2da4e095 refine log, can be used when _srs_config is NULL. 2014-07-26 14:58:33 +08:00
winlin
7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 2014-07-26 14:43:37 +08:00
winlin
b56e7ef7ab complete main utest for config 2014-07-22 11:14:51 +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
21f49a9875 add basic utest for config service 2014-07-20 17:44:20 +08:00
winlin
0db2e6b8e9 fix the empty config error 2014-07-20 17:08:47 +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
9b6c22644d add basic utest for config directive 2014-07-20 15:27:05 +08:00
winlin
6f743a2fe8 pass all utest 2014-07-20 13:48:24 +08:00
winlin
e47c0ae202 refine all consts 2014-07-20 13:46:36 +08:00
winlin
573952e2fc refine macros of HTTP 2014-07-20 13:33:21 +08:00
winlin
baa20b2f31 refine the config consts 2014-07-20 13:16:24 +08:00
winlin
073d900674 add consts to kernel 2014-07-20 13:04:48 +08:00
winlin
d609fbc7ce 1.0.mainline6, core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines. 2014-07-13 20:39:31 +08:00
winlin
cc62d254f0 add librtmp bandwidth check/test client. 2014-07-13 16:10:06 +08:00
winlin
5b714ba970 fix utest bug, when ssl disable, ignore complex handshake utest. 2014-07-13 13:47:46 +08:00
winlin
e2d273f493 do performance test, support 1.8k, improve 22% 2014-07-12 10:26:09 +08:00
winlin
047fb74889 refine rtmp client/server, add comments. 2014-07-12 09:01:34 +08:00
winlin
88c94193a3 rename rtmp_stack to stack. remove the global templte function to member function. 2014-07-12 08:47:47 +08:00
winlin
f7922e3823 refine protocol send. add utest for server auto response message 2014-07-12 07:41:52 +08:00
winlin
9556790a5e finish utest of protocol stack. 0.9.156 2014-07-11 18:08:34 +08:00
winlin
8e27df4cf7 refine the protocol, add comments, add utest for empty packet 2014-07-11 14:57:20 +08:00
winlin
c4aec5705b fix chunk header parse bug, add utest for basic/message header 2014-07-10 18:56:13 +08:00
winlin
d86e07b745 finish basic protocol utest, fix the bug of fmt11 length error. 2014-07-10 14:46:58 +08:00
winlin
54fda96f37 add utest for bug #98 2014-07-09 14:14:47 +08:00
winlin
2c3cb73ad6 update utest 2014-07-09 12:51:21 +08:00