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

523 commits

Author SHA1 Message Date
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
winlin
be746da21c Merge branch '3.0release' into 4.0release 2020-03-21 22:42:17 +08:00
winlin
850a4bbf20 Fix #1619, configure without utest by default. 3.0.136 2020-03-21 20:41:37 +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
winlin
4e7e9809f3 Fix bash script bug for macOS, eventhough we don't support it. 2020-02-16 22:35:40 +08:00
winlin
d9bbd97d72 Allow use libsrt.so for SRT is MPL license. 2020-01-26 17:41:05 +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
5d0833fcc3 Add author runner365 2020-01-24 18:41:09 +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
f143757429 Use macro to disable SRT in code 2020-01-23 14:23:09 +08:00
winlin
fb29096505 For SRT, allow/default disable it by --without-srt 2020-01-23 14:22:22 +08:00
winlin
fb5928f927 Fix build failed for SRT with modules. 2020-01-23 13:24:47 +08:00
runner365
03ef01c635 update configure 2020-01-22 10:59:50 +08:00
winlin
c3bf0cbe1b For #1547, check options for crossbuild. 2020-01-21 15:47:19 +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
7240fe3040 For #1509, decrease the fast vector init size from 64KB to 64B. 3.0.99 2020-01-15 21:26:02 +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
bf807778e5 For #1537, #1282, support multiple options for --extra-flags 2019-12-25 17:52:51 +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
cee4feda61 Fix make -jN random failed. 2019-12-20 11:49:27 +08:00
winlin
8047d0df45 For #1042, add test for RAW AVC protocol. 2019-12-18 15:50:17 +08:00
winlin
7bd7e1ccca Refine the circleci codecov script. 2019-12-11 12:06:28 +08:00
winlin
d866c77265 Fix the path for circleci 2019-12-11 07:23:54 +08:00
winlin
20fbb4466f Fix the path for circleci 2019-12-11 07:09:28 +08:00
winlin
f1cca0c360 Fix the path for circleci 2019-12-11 07:02:42 +08:00
winlin
0c673deb81 Fix the path for circleci 2019-12-10 23:25:15 +08:00
winlin
fae3a714a2 Fix the path for circleci 2019-12-10 23:21:26 +08:00
winlin
4c93d3a4c7 Fix the path for circleci 2019-12-10 23:13:56 +08:00
winlin
749b9fe444 Fix the path for circleci 2019-12-10 22:24:16 +08:00
winlin
0677e378ba Fix the path for circleci 2019-12-10 22:18:31 +08:00
winlin
e3077a8034 Fix the path for circleci 2019-12-10 22:09:52 +08:00
winlin
1b2aff84bc Fix the path for circleci 2019-12-10 21:45:58 +08:00
winlin
c90e321f9c Fix the path for circleci 2019-12-10 21:34:20 +08:00
winlin
94adda5dae Fix the circleci path 2019-12-10 21:14:01 +08:00
winlin
979f82e0dc Fix the circleci path. 2019-12-10 20:32:33 +08:00
winlin
0741b64b25 Remove KAFKA. 3.0.53 2019-10-03 12:49:22 +08:00
winlin
306ed8dbc8 Remove KAFKA. 3.0.53 2019-10-03 12:49:01 +08:00
winlin
5d17bb8bb0 Remove KAFKA. 3.0.53 2019-10-03 12:45:38 +08:00
winlin
9cdd506b4f Deprecated srs-librtmp. 2019-05-17 08:14:26 +08:00
winlin
a4160308f5 Refine comments. 2019-05-05 07:55:55 +08:00
winlin
6c12aa0eca Refine srs_update_system_time in time unit 2019-04-10 09:07:03 +08:00
winlin
a9a720e32f Cover ST Coroutine and time unit. 3.0.48 2019-04-07 12:59:37 +08:00
winlin
c646e3f287 CI: Research support codecov 2019-02-03 09:27:08 +08:00
winlin
a25efa3764 CI: Update codecov badge 2019-02-02 21:51:08 +08:00
winlin
7243d8e7b8 CI: Support codecov 2019-02-02 21:42:03 +08:00
winlin
5d959661e7 No sudoer 2018-12-22 20:51:57 +08:00
winlin
2e9bf2af83 Always enable SRS_StreamCaster 2018-12-22 20:45:25 +08:00
winlin
1dc95cba78 Always enable SRS_Ingest 2018-12-22 20:31:47 +08:00
winlin
aa1a5442f9 Always enable SRS_Ingest 2018-12-22 20:30:13 +08:00
winlin
e4e6dd2169 Always enable SRS_SSL 2018-12-22 20:08:42 +08:00
winlin
0bc7fdbb35 Always enable SRS_SSL 2018-12-22 20:03:40 +08:00
winlin
8e294709b0 Always enable SRS_STAT 2018-12-22 19:58:36 +08:00
winlin
71f1ccbf90 Always enable SRS_HLS 2018-12-22 19:54:10 +08:00
winlin
f003ba9a29 Always enable SRS_DVR 2018-12-22 19:50:57 +08:00
winlin
330100769f Always enable SRS_TRANSCODE 2018-12-22 19:48:55 +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
a8be5f8f27 Allow OSX for utest 2018-12-09 19:41:59 +08:00
winlin
f2a93755c2 Allow OSX for utest 2018-12-09 19:39:36 +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
99430d2edb For #1250, Not support macOS 10.14 2018-11-11 16:24:00 +08:00
winlin
58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 2018-10-28 14:09:55 +08:00
winlin
6d4315fc3c Disable valgrind by default 2017-06-28 09:08:19 +08:00
winlin
0ad4b65a56 Disable valgrind for osx. 2017-06-13 16:20:00 +08:00
winlin
33375db401 Merge from SRS2, for #834 2017-04-09 18:52:21 +08:00
winlin
b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 2017-04-09 18:45:42 +08:00
winlin
8b7566a007 Refine code 2017-03-26 18:30:33 +08:00
winlin
e3526c0cf6 For #820, modules use service only. 2017-03-26 13:40:39 +08:00
winlin
0a57a46016 Refine LICENSE 2017-03-25 21:29:29 +08:00
winlin
62b7204514 Refine code, add mp4 parser module 2017-03-25 15:40:28 +08:00
winlin
ad87bd7cf2 Refine configure 2017-03-01 09:21:20 +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
7fd221ef63 Always enable DVR 2017-02-11 17:27:40 +08:00
winlin
8e5d4dc73d always enable http and hls 2017-02-11 13:29:53 +08:00
winlin
11e8fe5bc0 refine options, remove rtmp-hls 2017-02-11 12:45:49 +08:00
winlin
a1fcf66f32 for #742, always enable http utilities. 2017-01-23 17:43:59 +08:00
winlin
c5fcc15989 update the date info 2017-01-18 16:41:47 +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
10a0c6c10c update for srs3 2017-01-06 17:55:06 +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
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
b2ae1acaa4 copy http-parser-2.1 into srs http stack. 2015-12-07 11:35:05 +08:00
winlin
44b26271bf Merge branch '2.0release' into develop 2015-11-11 17:12:34 +08:00
winlin
c4c63f7825 fix build failed bug for osx. 2015-11-11 17:06:12 +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
6df4d1f05a merge from srs2. 2015-11-05 15:12:49 +08:00
winlin
98e25def6c fix utest build failed for osx. 2015-11-05 15:11:59 +08:00
winlin
11979229e6 Merge branch '2.0release' into develop 2015-10-26 13:34:44 +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
8862ec1988 merge from srs2 2015-10-01 13:05:25 +08:00
winlin
a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 2015-10-01 13:04:28 +08:00
winlin
f187a7deef refine the startup logs. 2015-09-24 12:15:12 +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
f6e655396c for #485, support cross build for arm 2015-09-23 11:54:53 +08:00
winlin
d94a88a797 merge from srs2 for pi and cubie. 2015-09-23 11:23:55 +08:00
winlin
16730ea031 refine code for cross build 2015-09-23 11:21:51 +08:00
winlin
f75058413d Merge branch '2.0release' into develop 2015-09-23 10:39:24 +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
abb5c5ad31 add kafka producer 2015-09-22 17:40:05 +08:00
winlin
8a6edac4e8 add --x86-64 alias for --x86-x64. 2015-09-22 13:52:14 +08:00
winlin
edead21a25 refine the options 2015-09-22 12:51:29 +08:00
winlin
e415824576 refine the options 2015-09-22 12:43:22 +08:00
winlin
e4e36a0166 merge from srs2, fix openssl build 2015-09-21 12:03:47 +08:00
winlin
d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 2015-09-21 12:01:48 +08:00
winlin
7b2b11e932 async call worker fast execute tasks. 2015-09-17 11:57:17 +08:00
winlin
087f7740b7 fix the build failed bug 2015-09-17 11:41:23 +08:00
winlin
256459e1ec fix the utest bug 2015-09-17 11:37:35 +08:00
winlin
0d66e92ab5 refine code, support configure to enable --memory-watch 2015-06-13 15:45:25 +08:00
winlin
1f1776a0d8 fix the export project bug. wakeup connection when dispose server. 2015-06-09 14:38:05 +08:00
winlin
969ed7b0ae refine build summary. 2015-06-09 11:51:40 +08:00
winlin
7996b3b789 add warning for gmp, use gmc to detect memory leak. 2015-06-09 10:52:32 +08:00
winlin
574cf6a094 use libfdk_aac for srs2. 2015-06-08 15:02:19 +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
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
2239e9f1fd support ingest hls live stream to RTMP. 2015-04-20 16:25:48 +08:00
winlin
1cb2992808 refine build for modules, add defines. 2015-03-23 17:49:45 +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
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