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

303 commits

Author SHA1 Message Date
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
winlin
74fa3ba16f fix build failed for linux. 2015-03-13 17:34:33 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
3e5821efff enable http api for x86_x64 2015-03-11 15:04:34 +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
b8e70f8538 support module 2015-03-07 16:49:21 +08:00
winlin
ee30e6bb1f Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop 2015-03-07 16:39:56 +08:00
winlin
a29b8a7a5b refine configure, move auto headers to script. 2015-03-07 16:33:06 +08:00
winlin
496f689de7 fix bug for libfdk aac. 2015-03-06 22:29:49 +08:00
winlin
025b707330 refine the http request reader. 2015-03-04 18:20:15 +08:00
winlin
0af6e5e829 fix bug for srs-librtmp 2015-02-03 17:37:21 +08:00
winlin
8374017329 build libfdk-aac in ffmpeg. 2.0.108 2015-01-29 10:45:19 +08:00
winlin
52891b491a listen and serve stream caster mpegts over udp. 2015-01-24 14:52:52 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
7f121efd7a merge from allspace srs-librtmp for win vs2010. 2.0.36 2014-11-28 10:33:36 +08:00
winlin
d6072b16c0 support compile srs-librtmp on windows. 2.0.26 2014-11-19 16:16:04 +08:00
winlin
0c39a704c2 update build srs librtmp single 2014-11-16 11:29:50 +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
6968aef66a update readme for srs-librtmp 2014-11-08 20:06:31 +08:00
winlin
a827766cd6 for #191, support exported to project or file. 2014-11-08 18:43:58 +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
d4d3d46317 implements export srslibrtmp. for bug #191 2014-11-08 15:31:21 +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
fc347a1c44 update configure, remove the bwtc, moved to research now. 2014-08-18 14:15:39 +08:00
winlin
f03fde37ea refine configre, add --with-stat to configure summary 2014-08-17 22:19:52 +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
fd1e8aa882 remove src/main/srs_main_bandcheck.cpp, and --with-bwtc(use librtmp instead). 0.9.159 2014-07-13 19:42:06 +08:00
winlin
cc62d254f0 add librtmp bandwidth check/test client. 2014-07-13 16:10:06 +08:00
winlin
cf7a48e3da refine options.sh in auto 2014-07-13 13:50:58 +08:00
winlin
e53655ee83 refine the build script 2014-07-13 13:31:24 +08:00
winlin
6a2f0a3dc9 add configure preset --demo 2014-06-29 10:50:58 +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
6ae6f6e60d add freetype2 to pkg-config path. 2014-06-26 17:14:52 +08:00
winlin
10953c9743 support token auth in connect args. 0.9.128 2014-06-21 11:41:00 +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
46611ac062 refine configure, add cubieboard. use IProtocolStatistic in kbps. 2014-06-19 11:22:24 +08:00
winlin
3dbe8ba9de update configure script 2014-06-08 13:18:34 +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
niesongsong
327f030ef5 Update options.sh 
fix options bug like: --prefix=../bin
 2014-05-12 10:56:36 +08:00
winlin
8388da6325 add miss files. fix bug #60: support aggregate message 2014-05-08 14:33:25 +08:00
Steven Liu
7ba7fd487e fix problem: cannot build x264 normal minimal Linux 
parameters:
External library support:
  --disable-avs            disable avisynth support
  --disable-swscale        disable swscale support
  --disable-lavf           disable libavformat support
  --disable-ffms           disable ffmpegsource support
  --disable-gpac           disable gpac support

  There have no ffmpeg or libav when build x264, so no needed
  these parameters.

Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
 2014-05-06 13:41:55 +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
1af2c9bcc9 update script add librtmp for arm for tools flv/rtmp ingester 2014-04-21 15:46:29 +08:00
winlin
6f984ff54b fix bug of raspberry-pi build, static off 2014-04-21 15:17:45 +08:00
winlin
d013801c26 add configure options --disable-all 2014-04-18 15:13:52 +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
47927ab460 refine options, change to 0.9.66 2014-04-16 13:24:00 +08:00
winlin
cc338fdb7c fix bug for default configure 2014-04-16 12:37:19 +08:00
winlin
96115ac4f7 fix bug of config params. x86/x64/pi never use static 2014-04-15 16:07:25 +08:00
winlin
90dee0924d fix bug of build script 2014-04-15 14:24:03 +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
bcfe82f88f update options for configure help 2014-04-14 10:02:50 +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
ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 2014-04-11 10:40:21 +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
3b59a6c687 fix bug of package for arm 2014-04-07 17:03:56 +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
5fd582cd26 fix bug of package for arm 2014-04-07 16:52:38 +08:00
winlin
a8c5db3fc7 fix bug of package for arm 2014-04-07 16:51:39 +08:00
winlin
05e22e9530 fix script run/build/stop bug 2014-04-07 15:26:21 +08:00
winlin
5e6c490ba0 add ingest compile feature 2014-04-06 21:05:18 +08:00
winlin
e80abac4f0 add ingest feature to readme 2014-04-06 20:59:58 +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
5ff1d589f7 change warn to trace for nginx disabled 2014-04-06 19:19:13 +08:00
winlin
d546f815df update build/run/stop script 2014-04-06 19:13:29 +08:00
winlin
7916cab50e donot check the aac encoder, ensure aac is ok 2014-04-05 15:01:41 +08:00
winlin
7de8bd7595 allow pi to use ffmpeg 2014-04-05 14:38:19 +08:00
winlin
2949c751f6 update install, create http root 2014-04-05 14:17:49 +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
52263457bf fix bug of no http-server feature 2014-04-01 15:42:27 +08:00
winlin
d28458d5fa fix script build bug 2014-04-01 15:33:09 +08:00
winlin
e3254377ce update depends, allow pi/dev to enable gprof/gperf 2014-03-31 10:08:00 +08:00
winlin
234ce08ed3 force st to use epoll 2014-03-30 23:42:05 +08:00
winlin
c6cdc4ad54 refine package for raspberry. 2014-03-30 12:33:47 +08:00
winlin
be8aa92ab0 refine package for raspberry. 2014-03-30 12:31:50 +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
7b3bc8f741 fix bug of bwtc 2014-03-26 10:05:07 +08:00
winlin
7431c110fe package support arm package 2014-03-24 10:51:37 +08:00
winlin
ade3630fa6 add package and install script 2014-03-23 22:52:08 +08:00
winlin
9055d8eecf update readme. 2014-03-23 18:03:24 +08:00
winlin
4ddb5256ac fix bug of init.d script 2014-03-23 11:25:42 +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
2036cef43b Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-03-20 15:16:28 +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
6bc18f2e44 fix script generate auto header bug, always create file 2014-03-20 14:23:36 +08:00
winlin
238349b0c0 update configure, change to 0.9.23 2014-03-20 14:08:53 +08:00
winlin
6374fa1383 simple default configure, only enalbe ssl+hls, disable ffmpeg/nginx/utest/gperf/gprof 2014-03-20 13:30:06 +08:00
winlin
12445174e7 add option --static, to static link for arm 2014-03-19 12:39:09 +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
e0e451b680 add utest support for arm 2014-03-19 11:24:25 +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
48343e4f3a refien build script, regenereate all options. change to 0.9.12 2014-03-08 11:25:02 +08:00
winlin
1892245db6 add option bwtc, to enable or disable the bandwidth test tool 2014-03-07 19:07:38 +08:00
winlin
0a2b8b797d support disable the librtmp 2014-03-07 18:55:15 +08:00
winlin
59a2d5e7e0 add --with-gprof support 2014-03-07 17:18:31 +08:00
winlin
6e0bebdacf full support gperf gmc/gmp/gcp 2014-03-07 15:40:55 +08:00
winlin
8cd1c11add change forward schema 2014-03-07 14:27:32 +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
03a14e2e1a add gperftools for mem leak detect, mem/cpu profile. 2014-03-06 16:52:51 +08:00
winlin
7239963780 add heap checker and profiler demo 2014-03-06 16:23:35 +08:00