1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

297 commits

Author SHA1 Message Date
winlin
28517849ed refine typo 2016-12-07 12:09:39 +08:00
winlin
a8ee3162d4 Merge branch '2.0release' into develop 2016-03-03 15:30:38 +08:00
winlin
d72b93e58b fix the sed bug, to compatible with osx 2016-03-03 10:57:26 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
b2ae1acaa4 copy http-parser-2.1 into srs http stack. 2015-12-07 11:35:05 +08:00
winlin
c4c63f7825 fix build failed bug for osx. 2015-11-11 17:06:12 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +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
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
16730ea031 refine code for cross build 2015-09-23 11:21:51 +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
d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 2015-09-21 12:01:48 +08:00
winlin
fec8422d6b fix bug of configure. 2015-05-27 10:23:40 +08:00
winlin
a45cf38d44 auto detect the sed command for osx. 2015-05-24 14:52:37 +08:00
winlin
7fc1cda392 add stream status to api. 2015-05-08 16:45:25 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
cf3becbc17 for #155, osx(darwin) enable http api and stat, rusage is ok. 2015-03-17 22:35:47 +08:00
winlin
a28c051c2c osx support build nginx and ffmpeg 2015-03-17 21:51:19 +08:00
winlin
f3e5431d0f check what a fuck os for some fresh. 2015-03-17 21:12:30 +08:00
winlin
33e579599c refine build for osx 2015-03-16 22:25:59 +08:00
Nimrod A. Abing (on kohima)
bc93147426 for #308, disable st examples. for #334, refine the st init and event select. 2015-03-16 15:35:01 +08:00
winlin
74fa3ba16f fix build failed for linux. 2015-03-13 17:34:33 +08:00
winlin
0ff49fd299 for #155, debug srs on xcode. 2015-03-10 13:13:31 +08:00
winlin
db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 2015-03-10 12:50:27 +08:00
winlin
a29b8a7a5b refine configure, move auto headers to script. 2015-03-07 16:33:06 +08:00
winlin
025b707330 refine the http request reader. 2015-03-04 18:20:15 +08:00
winlin
52891b491a listen and serve stream caster mpegts over udp. 2015-01-24 14:52:52 +08:00
winlin
55580ca900 add comments about bug #197 2014-11-12 13:47:04 +08:00
winlin
2adf2550dc refine the depends to make st script 2014-11-11 13:42:06 +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
cc811dfc90 refine script for generate script 2014-11-08 20:14:20 +08:00
winlin
3405f35d06 fix #191: configure --export-librtmp-project and --export-librtmp-single. 2.0.11. 2014-11-08 18:33:15 +08:00
winlin
926650840e fix #191, configure --export-librtmp. 2.0.10. 2014-11-08 16:45:50 +08:00
winlin
eb88ebfb39 use relative objs dir for makefile. for bug #191 2014-11-08 16:07:31 +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
2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224 2014-10-09 10:41:24 +08:00
winlin
6103b1c3ce refine options, add --with-stat. 0.9.199 2014-08-17 22:11:43 +08:00
winlin
3111870316 for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198. 2014-08-17 20:38:51 +08:00
winlin
554a9763db fix linux config openssl bug. 2014-08-17 19:43:53 +08:00
winlin
5e4dad210a build openssl for osx, for bug #155. 2014-08-17 19:12:12 +08:00
winlin
e37f312f27 refine the code for ios build. add authors StevenLiu. 0.9.177 2014-07-27 21:56:44 +08:00
Steven Liu
b50ecd6dbe Support porting srs on MacOS OSX system Platform
Add the OSX platform cross complie options into srs
2014-07-27 19:32:12 +08:00
winlin
f562a98602 add configure options --log-verbose/info/trace to compile log macros. 0.9.169 2014-07-23 14:37:54 +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
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
594c1d8bf7 fix ssl make install on ubuntu 14, change to make install_sw 2014-06-28 23:16:14 +08:00
winlin
6ff193c989 donot need to yum install pkg-config, for centos always installed it 2014-06-20 10:40:06 +08:00
winlin
94e5e7070d fix bug of freetype2 build for ffmpeg, depends on pkg-config 2014-06-20 10:25:52 +08:00
winlin
603b3bcdcc add libfreetype2 for ffmpeg, remove the depends of freetype of build_ffmpeg. 2014-06-19 16:15:49 +08:00
winlin
8fabd5d987 refine cubieboard configure, use ubuntu prepare to install tools 2014-06-19 13:32:19 +08:00
winlin
31b568b013 refine core, move specified functions to kernel utility. 2014-06-08 13:03:03 +08:00
winlin
2265173c4d donot install tools when ffmpeg is not open, 0.9.108 2014-05-20 18:11:33 +08:00
winlin
8388da6325 add miss files. fix bug #60: support aggregate message 2014-05-08 14:33:25 +08:00
winlin
e5290725ab fix bug of mips 2014-05-04 19:13:21 +08:00
winlin
0c121f1c9b fix bug of mips 2014-05-04 18:54:57 +08:00
winlin
97f4d81193 fix bug of mips 2014-05-04 18:52:32 +08:00
winlin
1e9561150a add mips 2014-05-04 18:38:08 +08:00
winlin
36c2c37b42 add srs.test for configure test and utest. 2014-04-16 15:22:12 +08:00
winlin
78e7a31ddb refine option, add --use-sys-ssl, change to 0.9.67 2014-04-16 14:27:34 +08:00
winlin
406a30e533 add configure preset, add test for configure 2014-04-16 14:14:48 +08:00
winlin
cc338fdb7c fix bug for default configure 2014-04-16 12:37:19 +08:00
winlin
23a1b29935 add dvr option. refine macros of auto headers 2014-04-15 14:01:57 +08:00
winlin
1ae9178605 add favicon.ico, change to 0.9.65 2014-04-15 11:19:15 +08:00
winlin
73c310cd2e refine the macro. 2014-04-14 09:10:36 +08:00
winlin
04a526b340 change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE 2014-04-13 17:14:33 +08:00
winlin
7c64a893f5 add demo.m3u8 and demo.html 2014-04-11 15:26:37 +08:00
winlin
017b96f9b5 fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt 2014-04-09 11:51:05 +08:00
winlin
056895a978 add comments for the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt 2014-04-09 11:06:53 +08:00
winlin
eba35e2ac0 refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool 2014-04-08 15:28:34 +08:00
winlin
667191913b fix bug of package for arm 2014-04-07 17:01:48 +08:00
winlin
5c9941989e fix bug of package for arm 2014-04-07 16:57:05 +08:00
winlin
503fb93d4e fix bug of package for arm 2014-04-07 16:56:45 +08:00
winlin
5e6c490ba0 add ingest compile feature 2014-04-06 21:05:18 +08:00
winlin
983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding 2014-04-06 20:30:51 +08:00
winlin
d546f815df update build/run/stop script 2014-04-06 19:13:29 +08:00
winlin
4e3fe36ae2 refine http server pages. change to 0.9.51 2014-04-05 13:14:59 +08:00
winlin
1117f78587 support arm build for http api and server 2014-04-04 11:36:22 +08:00
winlin
4a40075f68 add contributors to api/v1/authors 2014-04-03 13:48:52 +08:00
winlin
341b5151d9 create http handler framework 2014-04-02 18:07:34 +08:00
winlin
1922d62ff7 add --with-http-api option 2014-04-01 16:06:32 +08:00
winlin
d28458d5fa fix script build bug 2014-04-01 15:33:09 +08:00
winlin
234ce08ed3 force st to use epoll 2014-03-30 23:42:05 +08:00
winlin
3932cf1334 update build, always patch st, for we need to build in raspberrypi directly 2014-03-29 14:25:47 +08:00
winlin
7431c110fe package support arm package 2014-03-24 10:51:37 +08:00
winlin
73f1762122 fix bug of build cherrypy 2014-03-22 22:55:18 +08:00
winlin
62762cf1ad add reload support. add make install and uninstall 2014-03-22 22:07:14 +08:00
winlin
8600c0ebe9 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-03-20 18:56:48 +08:00
winlin
b708f588fc refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable. 2014-03-20 18:19:08 +08:00
winlin
ef7853d7f7 fix demo bug, remove the api server static-dir when link to nginx 2014-03-20 15:15:46 +08:00
winlin
238349b0c0 update configure, change to 0.9.23 2014-03-20 14:08:53 +08:00
winlin
efa22074be always use static link, for manually build arm, and x86/64 use static link is ok. 2014-03-19 12:18:48 +08:00
winlin
d89d16ca1e print the system info when startup main 2014-03-19 10:51:33 +08:00
winlin
71adff776b fix build script, remove unused build tool defines 2014-03-17 11:10:57 +08:00
winlin
77e652fcbe refine buils nginx script 2014-03-17 10:52:49 +08:00
winlin
421fbd4c3e fix bug of arm build script__SRS_BUILD_NGINX=NO 2014-03-17 10:48:44 +08:00
winlin
5a4373d483 Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp. 2014-03-16 20:58:04 +08:00
winlin
a9da5903f6 arm support ssl/hls, change to 0.9.17 2014-03-16 20:16:42 +08:00
winlin
98c9002b41 remove the patch for st for arm 2014-03-12 16:01:50 +08:00
winlin
3066a03fb7 rename SRS_HTTP to SRS_HTTP_CALLBACK 2014-03-10 23:13:09 +08:00
winlin
2fa0d60186 simplify usage 2014-03-10 19:13:18 +08:00
winlin
91c1a2cd28 fix ubuntu build bug, add --force-yes to install 2014-03-10 13:33:13 +08:00
winlin
f6126c5ad2 fix ubuntu build bug, add --force-yes to install 2014-03-10 13:09:45 +08:00
winlin
741d6f97f6 support gperf memory check(gmc). 2014-03-07 12:24:47 +08:00
winlin
dcd568a0d7 add gperf to heap check, use reload signal to terminate program normally 2014-03-06 18:12:19 +08:00
winlin
7239963780 add heap checker and profiler demo 2014-03-06 16:23:35 +08:00
winlin
0b17b2a481 build gperftools 2014-03-06 14:10:45 +08:00
winlin
338e129a29 add utest build project, no testcase. 2014-03-04 16:13:12 +08:00
winlin
fe5811304b add utest script to generate the utest Makefile 2014-03-04 14:01:43 +08:00
winlin
02326cd844 support build with jobs 2014-03-04 13:03:20 +08:00
winlin
52b6ab3f2f support build with jobs 2014-03-04 12:45:41 +08:00
winlin
47aee8dce0 add utest framework gtest 2014-03-03 18:28:50 +08:00
winlin
ac3be10435 patch st and srs for arm build, allow user to specifies the gcc/g++ 2014-03-01 00:17:41 +08:00
winlin
a6f4815994 use local openssl and link libssl.a 2014-02-28 22:42:25 +08:00
winlin
72d477f466 support use other g++ when configure. 2014-02-28 14:38:27 +08:00
winlin
cd7e6cc321 refine the configure, add comments 2014-02-28 13:17:31 +08:00
winlin
527abe2157 update readme 2014-01-19 11:37:55 +08:00
winlin
b54aefe897 update script 2014-01-05 16:48:10 +08:00
winlin
47dfdd3ae2 update readme 2014-01-05 15:58:17 +08:00
winlin
b6280f3804 jump nginx index to api-server, for ie crossdomain. 2013-12-26 09:50:10 +08:00
winlin
4b4f317e09 refine the ui, link the players to the api server static dir 2013-12-25 23:42:23 +08:00
winlin
7a21427b10 override the default nginx page. jump to players page. 2013-12-21 14:12:37 +08:00
winlin
6beff7cf54 fix build script bug, create nginx/html/live dir 2013-12-18 15:22:14 +08:00
winlin
609a8fa472 update depends script 2013-12-18 15:05:49 +08:00
winlin
764aa9b40a refine the build script 2013-12-18 14:32:47 +08:00
winlin
ff4b28f4d4 extract the srs.js 2013-12-18 13:44:18 +08:00
winlin
c4477cd64f add players to nginx 2013-12-17 11:30:00 +08:00
winlin
c7ec6f511c fix the script error 2013-12-15 16:53:37 +08:00
winlin
ae18c388c1 fix bug of build script on centos 2013-12-10 11:37:59 +08:00
winlin
5d349882bb update build script for ubuntu 2013-12-10 10:37:18 +08:00
winlin
86e30ec2c9 update build script for ubuntu 2013-12-10 10:34:33 +08:00
winlin
bb90881489 auto install depends software for ubuntu or centos. 2013-12-10 10:09:29 +08:00
winlin
bb22c3b5cd add http library, support in build script 2013-12-07 20:51:27 +08:00
winlin
4b9eabdf01 udpate files. 2013-12-07 19:28:11 +08:00
winlin
263213d8b6 update version, add build date 2013-12-07 19:27:31 +08:00
winlin
4827777035 fix the build ffmpeg script bug, add yasm to path when build 2013-12-06 10:46:32 +08:00
winlin
5502344e85 add forward sample 2013-12-01 12:16:57 +08:00
winlin
525af4599f support live stream transcoding by ffmpeg. 2013-11-30 23:04:47 +08:00
winlin
ad618702aa add ffmpeg build script 2013-11-30 13:55:14 +08:00
winlin
041ce8f18f add ffmpeg build script 2013-11-30 12:52:15 +08:00
winlin
e4840d4480 add ffmpeg build script 2013-11-30 12:43:55 +08:00
winlin
14c2585cc3 add build ffmpeg script 2013-11-30 11:59:21 +08:00
winlin
ec5cb39b96 add options --with/without -hls/ssl 2013-11-27 22:41:58 +08:00