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

608 commits

Author SHA1 Message Date
winlin
d24aef50ba for #369, support RTMP 302 api at protocol level. 2016-01-08 18:17:37 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
9d22d09646 show signature of server. 2016-01-04 17:28:18 +08:00
winlin
f516636448 refine code for hooks and http core. 2015-12-29 18:33:02 +08:00
winlin
49308dddfb update 2015 to 2016 2015-12-23 11:41:41 +08:00
winlin
eec2c34b5c refine publisher. 2015-12-01 10:42:13 +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
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
fe27e76492 support schema 2015-10-26 18:34:55 +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
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
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
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
没——问题
e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
 2015-09-17 12:09:29 +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
b25c45c643 refine srs player, support set the bufferTimeMax. 2015-08-24 07:55:30 +08:00
winlin
dd21eee7f0 srs player show current time and url 2015-08-20 18:33:33 +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
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +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
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
be342178c0 fix ingest flv tool, support non monotonically timestamp. 2015-07-13 22:09:01 +08:00
winlin
93a1d097dc update jwplayer to support play HTTP flv. 2015-05-23 19:22:37 +08:00
winlin
ac13817aae update donation 2015-05-08 07:04:31 +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
dbcd7d883b add script check_hls_backup.sh to research hls. 2015-04-23 16:58:00 +08:00
winlin
23b978c0bb merge from github 2015-04-20 11:28:46 +08:00
winlin
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +08:00
winlin
0000c945ea refine the proxy api server. 2015-04-10 16:07:45 +08:00
winlin
fe1886aa08 add proxy for hls 2015-04-10 15:50:12 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
bd77f995bf ignore the unknown flv tag. 2015-04-09 12:35:17 +08:00
winlin
64b065e450 for hls callback, add duration of ts. 2015-04-03 13:46:44 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
97442c56b6 enhance hls in floor mode. 2015-03-31 17:03:14 +08:00
winlin
76c1957260 enhance hls, increase piece one by one. 2015-03-31 16:58:20 +08:00
winlin
bbac2348db for #354, remove the double underscore functions and variables. 2015-03-21 11:55:28 +08:00
winlin
a15ce1147f for #155, fix all warnings for mac. 2015-03-13 12:53:01 +08:00
winlin
a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 2015-03-11 15:54:31 +08:00
winlin
f247ac9daf fix the http parse bug. 2015-03-11 14:48:51 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
1685cdd48e for #250, parse pes packet ok, ts message ok. 2015-01-29 22:58:02 +08:00
winlin
77e43d1813 refine comments of aac publish for #212 2015-01-18 22:11:38 +08:00
winlin
a1f887f46f refine code, move onMetaData to consts. 2015-01-17 13:29:11 +08:00
winlin
04aa6f8296 drop script data except the onMetaData packet. 2015-01-17 13:23:30 +08:00
winlin
44f5efda21 refine the print info. 2015-01-07 15:46:00 +08:00
winlin
5aa31568ba fix the rtmp dump, parse the aggregate msg. 2015-01-07 15:35:01 +08:00
winlin
89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 2015-01-07 13:37:23 +08:00
winlin
0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 2015-01-07 13:29:30 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00
winlin
45724bfaec update conf for transcode. 2015-01-03 14:46:29 +08:00
winlin
07b207b7e3 remove test code for api-server. 2015-01-02 10:30:25 +08:00
winlin
9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 2015-01-02 10:21:04 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
d171a26758 disable gop cache when not h.264. fix some warning. 2014-12-01 21:34:35 +08:00
winlin
c5dd334645 fix the warning of ts_info 2014-12-01 20:54:19 +08:00
winlin
ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 2014-11-28 12:26:36 +08:00
winlin
e11fa383ca udpate the srs_bwt. 2014-11-25 11:09:28 +08:00
winlin
02778dba4c udpate the srs_bwt. 2014-11-25 11:05:45 +08:00
winlin
a2af051840 udpate the srs_bwt. 2014-11-25 10:59:38 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
3d97048c3a fix bug #217, add reuse conn to play different player. 2014-11-22 19:15:40 +08:00
winlin
d80b580c2f refine librtmp, remove the _get_ for some attribute get. 2014-11-21 16:08:29 +08:00
winlin
bb7a19636a fix the bandwidth file name bug. 2014-11-21 14:30:01 +08:00
winlin
aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 2014-11-21 14:18:50 +08:00
winlin
10bc5399ec refine librtmp api, add prefix utils for utilities. 2014-11-21 14:09:17 +08:00
winlin
b3bb2cdf2b refine code, rename the human functions to prefixed with srs_human_ 2014-11-21 14:03:30 +08:00
winlin
d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 2014-11-21 13:48:57 +08:00
winlin
a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 2014-11-20 13:36:14 +08:00
winlin
2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 2014-11-15 16:53:24 +08:00
winlin
278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 2014-11-15 16:30:37 +08:00
winlin
3292136f70 update research, flv ingester, support atc time flv. 2014-11-15 15:27:19 +08:00
winlin
7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 2014-11-15 13:20:58 +08:00
winlin
0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 2014-11-13 14:30:56 +08:00
winlin
77cf885d8c add comments for #161 2014-11-13 13:49:50 +08:00
winlin
bf5206d049 Revert "Revert "add test file to show the max open files."" 
This reverts commit ea70f29648.
 2014-11-11 17:02:16 +08:00
winlin
ea70f29648 Revert "add test file to show the max open files." 
This reverts commit c8673cd50e.
 2014-11-11 16:55:46 +08:00
winlin
c8673cd50e add test file to show the max open files. 2014-11-11 15:02:58 +08:00
winlin
8ab6b57612 research st, the timeout and coroutine scheduler. 2014-11-11 12:58:25 +08:00
winlin
be46e428ad research st, for bug #193, remove the code with bug, exit when fork. 2014-11-11 11:25:52 +08:00
winlin
f4dfee0e9f research st, add comments for bug #193. 2014-11-11 11:24:19 +08:00
winlin
cd09fcaf55 research st, remove all events except epoll. 2014-11-11 11:15:58 +08:00
winlin
91f6dbe479 research st, add test for setjmp and longjmp. 2014-11-10 16:50:36 +08:00
winlin
4d4e840209 research st, add jmp_flow. 2014-11-10 15:22:30 +08:00
winlin
683b01a6c9 research st, add comments about the thread cycle 2014-11-10 14:54:52 +08:00
winlin
8327a57b7e never use stack variable for setjmp 2014-11-10 14:02:49 +08:00
winlin
2c01f7e943 research st, expand MD_INIT_CONTEXT macro, the thread start. 2014-11-10 13:52:17 +08:00
winlin
8da8c49f39 research st, add comments 2014-11-10 11:49:14 +08:00
winlin
2b70212649 research st, add stack struct comments. 2014-11-10 11:47:24 +08:00
winlin
6bde1e54dc research st, add stack alloc commnets. 2014-11-10 11:10:27 +08:00
winlin
e49a868308 research st, rename variable thread to trd, for thread is a keyword. 2014-11-10 11:06:06 +08:00
winlin
ac1a4ec0a3 research st, always alloc on stack. 2014-11-10 10:21:05 +08:00
winlin
ae8b3e3c00 research st, remove the support of MD_STACK_GROWS_UP 2014-11-09 12:05:59 +08:00
winlin
340464ed56 research st, remove __ia64__ cpu support 2014-11-09 12:04:56 +08:00
winlin
a27c3dca2d research st, add gdb info for setjmp. 2014-11-09 11:56:14 +08:00
winlin
4b24ee9db3 research st, only for linux and arm/mips/i386/x86_64 cpus. 2014-11-09 11:46:32 +08:00
winlin
606fc13a03 rename the confict macro to srs_lib_trace 2014-11-08 18:37:15 +08:00
winlin
5554922820 refine librtmp tools, use srs_trace macro instead printf. 2014-11-08 14:06:40 +08:00
winlin
cf5c24af4a refine librtmp, unify all tools format and usage. 2014-11-08 14:00:59 +08:00
winlin
6de83db76e refine srs-librtmp log macro 2014-11-08 13:41:47 +08:00
winlin
f92303c764 refine all research tools, remove the public header, add log to srs_librtmp.h 2014-11-08 13:35:38 +08:00
winlin
3358570be6 refine for bug#66, implements the usage. 2014-11-08 10:44:00 +08:00
winlin
0075779d38 for bug #66, refine the api to send h264 frames. 2014-11-08 10:28:59 +08:00
winlin
cd5c58ba5f for bug #66, refine the api and demo. 2014-11-08 09:21:09 +08:00
winlin
1074c8d9b2 for bug #66, use new api to directly sendout h264 raw data. 2014-11-08 09:12:52 +08:00
winlin
6407baffd5 for bug #66, output the h264 frame type. 2014-11-07 23:19:31 +08:00
winlin
72ad6894ca move the annexb decode utility to protocol. 2014-11-07 23:07:31 +08:00
winlin
bd25626f0e refine code for bug #66 2014-11-07 22:36:25 +08:00
winlin
1c237a821a add api convert h264 to rtmp packet, for bug #66 2014-11-07 22:06:30 +08:00
winlin
e4af098d06 refine code for bug #66 2014-11-07 21:16:41 +08:00
winlin
b964a6c534 update for bug #66, add the srs-librtmp sample for publish h.264 raw stream. 2014-11-07 21:06:44 +08:00
winlin
1db69b153e update the research of arm 2014-11-07 16:47:49 +08:00
winlin
0f41e0d26f research st: only support linux 2014-11-06 15:45:31 +08:00
winlin
d67454ecc2 research st: only support linux 2014-11-06 15:43:28 +08:00
winlin
5fd308c64e update code, warning when compile dev branch. 2014-11-06 15:18:10 +08:00
winlin
fa53250202 refine the macro, use int as version type. 2.0.8 2014-11-06 14:23:08 +08:00
winlin
8521762cb3 research st: refine sync. 2014-11-06 14:00:27 +08:00
winlin
3377df0bea research st: refine skt. 2014-11-06 13:55:06 +08:00
winlin
22710db911 research st: refine sched. 2014-11-06 13:52:15 +08:00
winlin
f5f8e8946f research st: refine event, io and key. 2014-11-06 13:40:24 +08:00
winlin
c38a545780 reserach st: refine key.c 2014-11-06 13:17:54 +08:00
winlin
fd0c85b324 research st: refine io. 2014-11-06 13:11:34 +08:00
winlin
f8f18fffa7 research st: update test for st. 2014-11-06 12:50:27 +08:00
winlin
0f293802c8 research st: refine the md.h 2014-11-05 17:42:57 +08:00
winlin
856ba07bd3 research st: update public and common. 2014-11-05 17:22:36 +08:00
winlin
315707d726 research st: refine public 2014-11-05 17:16:15 +08:00
winlin
bba2d3dd98 research st: replace the TAB with 4spaces 2014-11-05 17:12:56 +08:00
winlin
55bd1dd95e research st: replace the TAB with 4spaces 2014-11-05 17:10:54 +08:00
winlin
0faa38dc0c research st: remove the osguess.sh 2014-11-05 17:06:18 +08:00
winlin
2dc6b7d1ea add io for st research 2014-11-05 17:01:15 +08:00
winlin
511c814ffb refs #182: rename to sync test. 2014-10-26 16:38:00 +08:00
winlin
69fdec411f refs #182: rename to sync test. 2014-10-26 16:35:12 +08:00
winlin
9aba47cbe3 refs #182: research st, add multiple threadds. 2014-10-26 14:04:31 +08:00
winlin
79ab9f05f3 refs #182: update the st, use cond and mutex. 2014-10-26 13:55:37 +08:00
winlin
388305f44c update st research. 2014-10-26 13:43:11 +08:00
winlin
fb906f0afc revert the player for bug #185. 2014-10-25 17:15:33 +08:00
winlin
6a3418cd45 fix #185, AMF0 support 0x0B the date type codec. 2.0.5. 2014-10-25 17:12:56 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +08:00
winlin
d24e2fd0cc remove supports for OSX. 2.0.1. 2014-10-18 13:58:23 +08:00
winlin
d9b12b151c refine the makefile. 2014-10-18 13:16:17 +08:00
winlin
b65df251c3 chmod +x *.sh 2014-10-12 21:50:28 +08:00
winlin
2f388d614f rename st-1.9 to st 2014-10-12 21:31:50 +08:00
winlin
7692373e02 remove the unused files. add upp project file 2014-10-12 21:29:48 +08:00
winlin
7f4c113e57 add st-1.9 to research 2014-10-12 20:57:59 +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
7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 2014-07-26 14:43:37 +08:00
winlin
f3e85a0063 refine the usage of csr. 2014-07-17 11:06:37 +08:00
winlin
5c4398f4a9 refine bandwidth check/test, flash publish test is ok. 2014-07-13 20:25:36 +08:00
winlin
8984ba9d56 refine the usage of bwtc. 2014-07-13 19:28:09 +08:00
winlin
9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 2014-07-13 19:16:18 +08:00
winlin
cc62d254f0 add librtmp bandwidth check/test client. 2014-07-13 16:10:06 +08:00
winlin
e53655ee83 refine the build script 2014-07-13 13:31:24 +08:00
winlin
019b25ea30 add MIT license to bandwidth check/test as/js library. 2014-07-13 10:05:30 +08:00
winlin
3a1b3dd142 fix bandwidth bug, config item interval to float. 2014-07-12 22:22:56 +08:00
winlin
d8ed7cc968 refine the js library for bandwidth test. 2014-07-12 21:03:26 +08:00
winlin
0707c24b54 refine the js library for bandwidth test. 2014-07-12 20:56:44 +08:00
winlin
2ff88b9bcd move js to srs_bwt. 2014-07-12 20:51:57 +08:00
winlin
c319cc6a40 refine bandwidth test client, provides js and as library 2014-07-12 20:48:03 +08:00
winlin
a888e52df1 donot mix the read and write for librtmp 2014-06-29 17:17:50 +08:00
winlin
1a7735182f refine the file stream, to file reader and writer. 0.9.142 2014-06-29 17:05:26 +08:00
winlin
55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139 2014-06-29 10:43:53 +08:00
winlin
aad42d7941 fix ubuntu14 build warnings 2014-06-29 00:09:55 +08:00
winlin
55b99c90c7 refine detect tool, support atc stream. 2014-06-11 14:16:44 +08:00
winlin
17cb8c4550 finish the research for python-subprocess 2014-06-11 11:14:43 +08:00
winlin
b7d8be46a1 add research for usage for subprocess 2014-06-11 11:03:22 +08:00
winlin
cccc483ab3 add bytes statistic for librtmp 2014-06-10 17:39:12 +08:00
winlin
a639eb0596 fix bug of buffer assert, erase can accept any value 2014-06-10 16:06:18 +08:00
winlin
d48d739fa7 fix bug of detect rtmp, add error code 2014-06-10 11:57:46 +08:00
winlin
4d9ed6f7fe refine the code, add comments to result to self interpret 2014-06-10 11:44:02 +08:00
winlin
8817823462 add rtmp detecter 2014-06-10 11:34:35 +08:00
winlin
ef6efb821c add rtmp detecter 2014-06-10 10:40:31 +08:00
winlin
48adeeb1a5 fix the demo player html text 2014-06-06 15:35:47 +08:00
winlin
e227bd3a0e remove the srs community 2014-05-31 17:47:02 +08:00
winlin
5273509554 refine log, to 0.9.123 2014-05-29 14:16:34 +08:00
winlin
7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122 2014-05-29 12:09:26 +08:00
winlin
22968c85df supprt inject flv 2014-05-28 19:01:47 +08:00
winlin
4970664e37 move codec to kernel. 2014-05-28 17:37:15 +08:00
winlin
608083d42f add flv injecter, add flv codec to librtmp. 2014-05-28 15:37:06 +08:00
winlin
009de72a01 fix research bug, rename srs_freepa to srs_freep 2014-05-28 10:20:11 +08:00
winlin
6de81fdb1c refine fast id tracer 2014-05-27 19:34:18 +08:00
winlin
384687a36d add server ip to flash client. 2014-05-27 16:17:40 +08:00
winlin
e39eed6519 add SrsPid and SrsId to client response, add pid to log 2014-05-27 16:11:25 +08:00
winlin
5ff1ce7cba for bug #87, response the server SrsId to flash. 2014-05-27 15:34:55 +08:00
winlin
14f0a2e046 for bug #88, add timeout for connect. 2014-05-26 18:21:35 +08:00
winlin
93c9c55fb9 remove the complex handshake of librtmp. refine makefile of librtmp tools 2014-05-26 15:54:39 +08:00
winlin
b13bd70c86 http streaming support flv start index. 2014-05-26 13:57:08 +08:00
winlin
cf7b6f25f6 add srs community 2014-05-23 22:39:13 +08:00
winlin
bd24fe7d75 support flv parser, add amf0 to librtmp. 0.9.110 2014-05-22 15:08:25 +08:00
winlin
69eb935505 fix bug of flv parser, librtmp amf0 library 2014-05-22 11:39:10 +08:00
winlin
d4b8fee61a fix bug #73, http callback api support authentication in tcUrl 2014-05-22 10:23:12 +08:00
winlin
f37faf7236 update librtmp, add amf0 parse functions 2014-05-21 18:30:58 +08:00
winlin
2a8db3ab83 refine the re of ingest flv, re cleanup always sleep 2014-05-21 09:31:38 +08:00
winlin
1d6b096ce9 adjust the deviation. 2014-05-20 18:15:02 +08:00
winlin
2265173c4d donot install tools when ffmpeg is not open, 0.9.108 2014-05-20 18:11:33 +08:00
winlin
7c804277b2 add heatbeat url, add stream for api-server 2014-05-19 15:27:05 +08:00
winlin
07fbd58f39 update api server, add meiyi demo streams. 2014-05-16 10:52:38 +08:00
winlin
add64533e3 add donation user chen.chen 2014-05-12 10:36:37 +08:00
winlin
1c1efd7000 update readme, update api server stream list 2014-05-10 14:01:40 +08:00
winlin
8388da6325 add miss files. fix bug #60: support aggregate message 2014-05-08 14:33:25 +08:00
winlin
b2aab8804b use complex handshake for srs play 2014-05-08 11:48:34 +08:00
winlin
f5f29e486f update code stat 2014-05-07 13:19:25 +08:00
winlin
5e806d62bb add code statistic tool 2014-05-07 11:07:10 +08:00
winlin
ae372de65e merge from wukong, fix the bug of build x264 on minimal server 2014-05-06 13:51:38 +08:00
winlin
90e50da305 update api server, add hiwifi 2014-05-05 18:07:06 +08:00
winlin
e5290725ab fix bug of mips 2014-05-04 19:13:21 +08:00
winlin
e3be7bfa88 disable detail log 2014-04-30 12:22:06 +08:00
winlin
30bb3ff704 add dvr_plan hss to full.conf 2014-04-30 11:56:19 +08:00
winlin
0f498acd7b add comments and variable for c3 extended-timestamp. to 0.9.82 2014-04-29 18:16:29 +08:00
winlin
e5720d3906 fix bug of research librtmp tools 2014-04-28 19:05:24 +08:00
winlin
241d04b391 update api server for android server vhost changed 2014-04-28 14:54:27 +08:00
winlin
e271cb607f refine plan, add stream start time for atc 2014-04-23 17:53:14 +08:00
winlin
09901d31da fix bug of android api server, fix the dead loop 2014-04-23 13:19:08 +08:00
winlin
580cbb84a9 add threading.Lock for cherrypy, or performance suffer. 2014-04-23 12:17:22 +08:00
winlin
6f984ff54b fix bug of raspberry-pi build, static off 2014-04-21 15:17:45 +08:00
winlin
a158d81085 update raspberry-pi demo api 2014-04-21 13:47:32 +08:00
winlin
b5b5202ed2 update cdn api server. 2014-04-21 10:40:30 +08:00
winlin
b85e667991 update api, select the lowest load of peer 2014-04-21 09:11:08 +08:00
winlin
87bdaa21c9 add nodes for api 2014-04-21 00:03:17 +08:00
winlin
dcb9941ed7 add hls api to api-server 2014-04-20 15:00:34 +08:00
winlin
4c5aae7804 fix bug of ingest for android, init the variable to 0 2014-04-19 12:49:15 +08:00
winlin
5c8aad4fe4 fix bug of ingest for android, init the variable to 0 2014-04-19 12:49:05 +08:00
winlin
c530a8e5fc fix bug of ingest for android, init the variable to 0 2014-04-19 12:47:16 +08:00
winlin
e42eef422f add ssl and nossl for ingest flv/rtmp over srs-librtmp 2014-04-19 11:40:46 +08:00
winlin
e5fcf80b94 refine ingest flv over srs-librtmp 2014-04-19 11:24:31 +08:00
winlin
b1835ee2fe add ingest flv to RTMP over srs-librtmp 2014-04-19 11:19:26 +08:00
winlin
f17f5de7d1 ingest rtmp to rtmp by srs-librtmp 2014-04-19 10:30:40 +08:00
winlin
608b28f223 add srs ingest flv/rtmp base on srs-librtmp 2014-04-19 09:47:47 +08:00
winlin
9ef7a83415 update server, add rtmp pc url 2014-04-17 10:08:04 +08:00
winlin
642fc19f9d update api server demo 2014-04-16 11:03:58 +08:00
winlin
1ae9178605 add favicon.ico, change to 0.9.65 2014-04-15 11:19:15 +08:00
winlin
b1877db405 fix typo of full.conf. fix api server bug 2014-04-14 17:31:59 +08:00
winlin
b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 2014-04-12 20:35:40 +08:00
winlin
9eb76cb1eb update demo.conf 2014-04-11 14:40:38 +08:00