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

329 commits

Author SHA1 Message Date
winlin
bb0ca05390 Merge branch 'develop' into feature/rtc 2020-04-06 21:38:05 +08:00
winlin
9c1dfb79d3 Fix gperf build bug 2020-04-06 21:37:37 +08:00
winlin
dc3df926eb For #307, support configure with sendmmsg. 2020-04-05 18:34:57 +08:00
winlin
10d5f99d3d For #307, SRTP ASM only works with openssl-1.0, auto detect it. 4.0.22 2020-04-05 17:14:22 +08:00
winlin
3793404ceb Refine scripts 2020-04-04 20:24:24 +08:00
winlin
c5c0df6536 Update build script 2020-04-04 15:44:56 +08:00
winlin
5144794044 Detect older docker and disable SRTP ASM 2020-04-04 14:50:36 +08:00
winlin
f504cb2724 Refine build script 2020-04-03 22:46:04 +08:00
winlin
366d800720 For #307, use files of openssl 1.0.* 2020-04-03 21:59:32 +08:00
winlin
5e06a2568b For #370, support SRTP with ASM(enable openssl) by default 2020-04-03 14:37:48 +08:00
winlin
bd05f69d0b Refine openssl build script on OSX 2020-04-03 13:42:24 +08:00
winlin
15384e61e2 Remove duplicated build for srtp2 2020-04-02 12:33:58 +08:00
winlin
f9f9cfda9b Refine cherrypy install script 2020-03-30 18:25:22 +08:00
winlin
60d810693c Refine rebuild components 2020-03-29 21:30:32 +08:00
winlin
056fcd2928 Refine clean script 2020-03-29 19:06:51 +08:00
winlin
40cc8ed47c Refine file path for st and ffmpeg 2020-03-29 18:44:01 +08:00
winlin
6935bb18ae Merge branch '4.0release' into develop 2020-03-29 17:36:33 +08:00
winlin
6b8f0d84a3 Merge branch '3.0release' into 4.0release 2020-03-29 17:31:41 +08:00
winlin
80f315f1ae Support utest on mac osx 2020-03-29 17:29:09 +08:00
winlin
22fbae139c Refine links use relative path 2020-03-29 17:15:29 +08:00
winlin
22ec783c3f Merge branch '3.0release' into 4.0release 2020-03-29 16:52:46 +08:00
winlin
1c65987472 Refine links use relative path 2020-03-29 16:51:56 +08:00
winlin
c0a8193537 Update build script 2020-03-29 15:23:40 +08:00
winlin
cc6a447332 Merge feature/rtc 2020-03-29 00:21:00 +08:00
winlin
32d818d69c Merge 4.0release 2020-03-29 00:16:37 +08:00
winlin
13ee53434e Merge branch '4.0release' into develop 2020-03-29 00:14:46 +08:00
winlin
3e0a7ee7fb Merge branch '3.0release' into 4.0release 2020-03-29 00:13:41 +08:00
winlin
98a71954da Support multiple OS/Platform build cache. 3.0.139 2020-03-29 00:09:17 +08:00
winlin
0fd75434a6 For #307, fast build openssl 2020-03-28 21:33:47 +08:00
winlin
dae7af8444 For #307, rtc support osx 2020-03-28 20:52:42 +08:00
winlin
f29db522c1 Merge branch '4.0release' into develop 2020-03-28 18:05:46 +08:00
winlin
9e8b88825b Merge branch '3.0release' into 4.0release 2020-03-28 18:05:19 +08:00
winlin
218fe332aa For #1250, support osx build 2020-03-28 18:04:34 +08:00
winlin
c2b02f86fa Merge 4.0release 2020-03-28 17:46:47 +08:00
winlin
217b8b94b6 Merge 3.0release 2020-03-28 17:45:14 +08:00
winlin
c339542ce0 Support macOS OSX 2020-03-28 17:20:40 +08:00
winlin
e5e2d05da0 For #307, support play with WebRTC. 4.0.14 2020-03-22 19:46:56 +08:00
winlin
41acc5033e For #307, support disable asm for FFMPEG 2020-03-22 19:26:26 +08:00
winlin
602a478e1b For #1659, #307, add switch to disable rtc 2020-03-22 18:17:05 +08:00
winlin
37c84eccc0 For #1659, #307, add x86 asm for ffmpeg for rtc 2020-03-22 17:14:07 +08:00
winlin
4308f238c0 For #1659, #307, add ffmpeg-4.2-fit for rtc 2020-03-22 16:34:54 +08:00
winlin
634a14bfa6 For #1659, #307, add opus codec library 2020-03-22 14:03:48 +08:00
xiaozhihong
936ba7583e modify depend.sh 2020-03-06 23:40:20 +08:00
xiaozhihong
9d5495c0c2 "stun and dtls done" 2020-03-06 23:01:48 +08:00
xiaozhihong
1c74083de8 Revert "use libco instead of state-thread(st), still have some bug" 
This reverts commit 7c8a35aea9.
 2020-02-17 15:30:20 +08:00
xiaozhihong
7c8a35aea9 use libco instead of state-thread(st), still have some bug 2020-02-16 21:07:54 +08:00
winlin
07f4bc65c3 Merge branch '3.0release' into develop 2020-01-26 17:33:29 +08:00
winlin
01870cce56 Allow use libst.so for ST is MPL license. 2020-01-26 17:33:10 +08:00
winlin
5f174552f3 Merge SRT 2020-01-24 16:10:40 +08:00
winlin
e3169a080b Refactor SRT build, use libsrt.a static library 2020-01-24 07:06:30 +08:00
winlin
ba61fe8bc5 Fix #1221, remove complex configure options. 3.0.104 2020-01-21 15:22:55 +08:00
winlin
0df108740a Fix #1547, support crossbuild for ARM/MIPS. 2020-01-21 13:59:43 +08:00
winlin
6af8e38017 For #1547, support setting cc/cxx/ar tools. 3.0.103 2020-01-21 10:28:25 +08:00
winlin
a6fe4e80d3 For #1547, remove the SRS_OSX macro in code 2020-01-20 11:25:39 +08:00
winlin
024433f327 For #1547, refine configure, remove some macros 2020-01-20 10:44:46 +08:00
winlin
416568f4ab Remove FFMPEG and NGINX, please use srs-docker instead 2019-12-25 18:39:01 +08:00
winlin
a11461905b Remove FFMPEG and NGINX, please use srs-docker instead . 3.0.82 2019-12-25 18:29:07 +08:00
winlin
f47e846bd2 For #1537, #1282, refine build st script 2019-12-25 16:26:40 +08:00
winlin
916ec71801 For #1537, #1282, use ST source code in SRS 2019-12-25 15:55:56 +08:00
winlin
c91ffbee93 For #1537, #1282, remove not used patches, note the patch for ARM already merged to ST in SRS3 2019-12-25 15:49:25 +08:00
winlin
a0c631de9f For #1537, #1282, support --extra-flags for unknown CPU arch. 2019-12-25 15:46:58 +08:00
winlin
71810c0209 For #1537, disable crossbuild for ARM/MIPS. 2019-12-25 13:18:53 +08:00
winlin
dffc96d2fe For #1537, disable crossbuild for ARM/MIPS. 2019-12-25 13:17:49 +08:00
winlin
a4160308f5 Refine comments. 2019-05-05 07:55:55 +08:00
winlin
c646e3f287 CI: Research support codecov 2019-02-03 09:27:08 +08:00
winlin
5d959661e7 No sudoer 2018-12-22 20:51:57 +08:00
winlin
0626bc5982 Use openssl in docker 2018-12-10 14:27:55 +08:00
winlin
432a575c7a Use docker for #1274 and #1250 2018-12-10 00:07:38 +08:00
winlin
b0e91e8fe9 Use docker for #1274 and #1250 2018-12-10 00:05:23 +08:00
winlin
ba4ef34d27 Merge 2.0release 2018-11-27 21:24:51 +08:00
Steven Liu
78cf3d4b58 upgrade x264 and ffmpeg to newest version (#1274) 
The ffmpeg and x264 in srs is too old.

Signed-off-by: Steven Liu lq@chinaffmpeg.org
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2018-11-27 21:17:42 +08:00
winlin
58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 2018-10-28 14:09:55 +08:00
winlin
cdfded6a74 Support disable valgrind 2017-02-28 14:47:00 +08:00
winlin
89a5fa69d1 Refine srs-librtmp, set the schema, rather that connect app3 2017-02-28 14:07:14 +08:00
HungMingWu
a6582c6208 Disable openssl thread support to prevent ubuntu linking pthread error 2017-02-25 09:47:29 +00:00
HungMingWu
01d5e4da17 Replace openssl from l-1.0.1f to 1.10e (#774) 
DUe to API breakchange, add a wrapper for backward compatibility
 2017-02-25 12:06:39 +08:00
HungMingWu
33d6274217 Replace ffmpeg version from 2.1.1 to 3.2.4 2017-02-13 23:29:39 +08:00
winlin
a1fcf66f32 for #742, always enable http utilities. 2017-01-23 17:43:59 +08:00
winlin
db231f6d37 refine hls html5 video template. 2017-01-10 18:43:36 +08:00
winlin
087a596a63 refine hls html5 video template. 2017-01-10 18:43:10 +08:00
winlin
1b1ae00910 fix #727, install valgrind-devel 2017-01-06 17:51:07 +08:00
winlin
f9a159cd21 patch ST for valgrind and ARM. 3.0.11 2017-01-05 10:45:41 +08:00
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