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

481 commits

Author SHA1 Message Date
winlin
608f3d0fae For #1500, support push stream by GB28181. 4.0.18 2020-03-31 23:06:07 +08:00
winlin
e19b927f92 Merge GB28181 2020-03-31 22:45:20 +08:00
winlin
a342f460e7 Merge branch '4.0release' into xialixin-dev-28181 2020-03-31 20:09:07 +08:00
winlin
33455867f9 Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181 2020-03-31 20:08:24 +08:00
xialixin
c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 2020-03-31 00:39:10 +08:00
xiaozhihong
9dadcdffd6 Merge remote-tracking branch 'upstream/feature/rtc' into sdp 2020-03-30 15:16:44 +08:00
xiaozhihong
49da2099c1 sdp exchange. 2020-03-30 15:16:29 +08:00
winlin
bf297fd070 Refine make help 2020-03-29 21:36:41 +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
a60dbc167a Update macro 2020-03-29 18:01:46 +08:00
winlin
3b8450d4bd Support cleanup componets 2020-03-29 17:54:27 +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
2ba8104b37 Update coverage script 2020-03-29 16:36:49 +08:00
winlin
b9a3df5c55 Update utest script 2020-03-29 16:18:20 +08:00
winlin
f8b0bc122b Update build script 2020-03-29 15:48:57 +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
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
e5e2d05da0 For #307, support play with WebRTC. 4.0.14 2020-03-22 19:46:56 +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
2757ec7973 Merge from bepartofyou 2020-03-21 23:09:57 +08:00
七曦
a0a4337214 make webrtc audio work 2020-03-21 21:50:06 +08:00
xiaozhihong
fa700dad64 1. Modify rtc.conf to support Bframe discard. 
2. Rename srs_app_rtp.cpp to srs_app_rtc.cpp
 2020-03-21 21:26:30 +08:00
winlin
de9a004ff7 Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2 2020-03-20 21:39:04 +08:00
xialixin
cbe9c1dabc Support gb28181 sip over udp, ps steam over rtp 2020-03-20 00:01:48 +08:00
winlin
9e856c84e7 For #1638, #307, remove unused bash variable. 2020-03-15 15:58:28 +08:00
winlin
d21ef106a0 Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc 2020-03-13 21:18:09 +08:00
xiaozhihong
027d34bbd3 add rtp shared packet 2020-03-13 20:34:40 +08:00
HuyaJohn
3ae510b843 rtp dispatch done, but video can not play in chrome 2020-03-09 04:46:27 -07:00
HuyaJohn
2e68c375e3 start coding flv->rtp 2020-03-08 04:20:46 -07:00
xiaozhihong
c62901a3ac make code easy, wrap udp remux socket 2020-03-08 00:30:31 +08:00
xiaozhihong
9d5495c0c2 "stun and dtls done" 2020-03-06 23:01:48 +08:00
Xiaofeng Wang
b525fc65aa Remove unused ip variable 
* "inet addr" is not compatible with rhel/centos 7+;
* ifconfig has been replaced by ip-utils in newer distro;
 2020-03-03 21:10:43 +08:00
xiaozhihong
62563bdd81 rtc framework 2020-02-28 23:18:39 +08:00
xiaozhihong
51abb0844e rtp session manager, stun codding 2020-02-23 23:19:40 +08:00
xiaozhihong
bc22ebe949 add rtc http request and response, exchange sdp. 2020-02-21 23:50:22 +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
55fa62e41f Update version4 2020-02-04 17:06:10 +08:00
winlin
59439cf8b5 Merge branch '3.0release' into develop 2020-02-04 17:05:19 +08:00
winlin
c01806d5c4 Refine version3 2020-02-04 17:04:03 +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
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
db5788b205 Update README for SRT 2020-01-23 20:47:32 +08:00
winlin
33c6bf1f8f Refactor SRT, using reverse dependency, SRT depends on APP. 2020-01-23 19:40:40 +08:00
winlin
1959d1d920 Extract hybrid server for SRT 2020-01-23 18:21:11 +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
winlin
2de8d788f6 Revert configure changes(srs_ingest_hls,utest) in previous commit 2020-01-23 12:32:15 +08:00
winlin
106113c5f0 For previous revert, pick some code for LibSRTRoot 2020-01-23 12:15:02 +08:00
winlin
a27c4f7095 Revert "remove modules for srt compile" 
This reverts commit d4c08c44d8.
 2020-01-23 12:09:54 +08:00
runner365
03ef01c635 update configure 2020-01-22 10:59:50 +08:00
runner365
d4c08c44d8 remove modules for srt compile 2020-01-21 20:31:33 +08:00
runner365
5c5fd805c5 add srt mpegts to rtmp 2020-01-21 19:20:09 +08:00
winlin
6af8e38017 For #1547, support setting cc/cxx/ar tools. 3.0.103 2020-01-21 10:28:25 +08:00
winlin
024433f327 For #1547, refine configure, remove some macros 2020-01-20 10:44:46 +08:00
runner365
7b9e3ecdc4 add ts demux 2020-01-17 19:43:54 +08:00
runner365
b53b75ea1e srt pull/push server 2020-01-14 21:10:33 +08:00
runner365
aeee3011ef add srt server file 2020-01-11 23:05:10 +08:00
winlin
9140e0f19d Improve test coverage for kernel mp4. 2019-12-30 13:50:19 +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
a0c631de9f For #1537, #1282, support --extra-flags for unknown CPU arch. 2019-12-25 15:46:58 +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
1e4f22f83d Fix random build failed bug for modules. 2019-12-19 14:30:34 +08:00
winlin
8047d0df45 For #1042, add test for RAW AVC protocol. 2019-12-18 15:50:17 +08:00
winlin
0394d95e4b Refine file structure for RTMP/HTTP protocol stack utest. 2019-12-13 20:04:33 +08:00
winlin
2b2a62ccba Cover protocol stack RTMP. 0.6.63 2019-10-23 09:26:10 +08:00
winlin
64288d1f1e Support systemctl service for CentOS7. 3.0.58 2019-10-05 20:33:26 +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
839a496d50 Refine get_mr_sleep in time unit 2019-04-09 09:20:44 +08:00
winlin
4302ab7708 Refine get_dash_fragment to time unit 2019-04-08 09:02:39 +08:00
winlin
a9a720e32f Cover ST Coroutine and time unit. 3.0.48 2019-04-07 12:59:37 +08:00
winlin
a2b0767874 Fix build failed. 2019-02-03 09:38:20 +08:00
winlin
c646e3f287 CI: Research support codecov 2019-02-03 09:27:08 +08:00
winlin
7243d8e7b8 CI: Support codecov 2019-02-02 21:42:03 +08:00
winlin
c6844527fb Always enable SRS_SSL 2018-12-22 20:23:39 +08:00
winlin
e4e6dd2169 Always enable SRS_SSL 2018-12-22 20:08:42 +08:00
winlin
ee068cf120 For #1109, Support without ssl for HLS key. 2018-08-25 21:15:26 +08:00
winlin
469250f850 For #464, support origin cluster api 2018-02-15 20:55:34 +08:00
winlin
5730bf8e43 Fix #913, support complex error. 3.0.26 2018-01-01 23:03:42 +08:00
RocFang
015e76cb3f Update configure (#1033) 
allow user to add some specific flags.
 2018-01-01 22:57:44 +08:00
winlin
609605a50b Fix #820, extract service for modules. 3.0.21 2017-03-26 17:05:50 +08:00
winlin
e3526c0cf6 For #820, modules use service only. 2017-03-26 13:40:39 +08:00
winlin
ff822b55cd For #820, extract service module. 2017-03-26 10:16:21 +08:00
winlin
da4c390d69 For #299, extract fragment and fragment window for hls 2017-03-18 21:29:08 +08:00
winlin
16cde27a1e Remove MacOS compile option, for it's on use. It's caused by paralell make 2017-03-01 12:39:42 +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
winlin
c4a510b834 For #299, refine the codec info structure. 2017-02-11 23:09:23 +08:00
winlin
477414106a add dash files. 2017-02-11 12:30:21 +08:00
winlin
eaa222f034 for #742, refine the file reader and writer interface. 2017-01-30 19:35:04 +08:00
winlin
6b6ac9a054 for #738, add box and fullbox. 2017-01-27 20:54:05 +08:00
winlin
91a3989372 for #738, add mp4 demuxer files to kernel. 2017-01-27 11:27:02 +08:00
winlin
b7dd764920 update gitignore 2017-01-09 15:17:08 +08:00
winlin
28517849ed refine typo 2016-12-07 12:09:39 +08:00
winlin
0596550a72 Merge branch '2.0release' into develop 2016-09-15 13:31:28 +08:00
winlin
92fb81003c link crypto when use sys-ssl 2016-09-15 12:59:34 +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
b2ae1acaa4 copy http-parser-2.1 into srs http stack. 2015-12-07 11:35:05 +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
6efd2dd27e add load balance round robin for brokers. 2015-09-24 17:20:04 +08:00
winlin
8b6c78b862 Merge branch '2.0release' into develop 2015-09-23 16:42:47 +08:00
winlin
d1de097f5e fix make clean bug, donot rm when no dir 2015-09-23 16:42:41 +08:00
winlin
4e88262512 merge from srs2 to check cpus. 2015-09-23 15:11:33 +08:00
winlin
f6e655396c for #485, support cross build for arm 2015-09-23 11:54:53 +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
abb5c5ad31 add kafka producer 2015-09-22 17:40:05 +08:00
winlin
df6ac8842c rename rtmp utility to protocol utility 2015-09-22 09:11:07 +08:00
winlin
82ff05c1d4 rename rtmp io to protocol io 2015-09-22 09:07:07 +08:00
winlin
168625dce2 rename rtmp amf0 to protocol amf0. 2015-09-22 09:05:21 +08:00
winlin
d32632ee8a rename SrsFastBuffer to SrsFastStream 2015-09-22 09:01:47 +08:00
winlin
ca3577e11b rename temp to stream 2015-09-22 08:52:00 +08:00
winlin
a4f51564db rename kernel stream to buffer 2015-09-22 08:48:55 +08:00
winlin
ac2b03a3ed rename srs_kernel_buffer to temp 2015-09-22 08:42:54 +08:00
winlin
1de2bb0801 add kafka protocol files. 2015-09-21 17:12:28 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
0e1861b084 for #367: extract the process from ffmpeg to exec programs. 2015-08-24 21:51:05 +08:00
winlin
66a26bdce8 move json from app to protocol 2015-08-21 16:20:19 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +08:00
winlin
3b8daafc03 use local openssl header files to avoid warnings on osx. 2015-07-06 10:32:28 +08:00
winlin
f8f6e438cc extract http static and http stream from http conn. 2015-06-14 14:06:39 +08:00
winlin
baa892a762 merge srs_app_st_socket to srs_app_st. 2015-06-14 08:43:38 +08:00
winlin
d103557a8b merge the rtmp sdk to stack. 2015-06-13 16:04:59 +08:00
winlin
8b3bd5b4b9 add srs memory watcher. 2015-06-07 15:13:41 +08:00
winlin
fec8422d6b fix bug of configure. 2015-05-27 10:23:40 +08:00
winlin
cf9ee04611 fix the utest build failed bug. 2015-05-24 18:56:52 +08:00
winlin
5908096fc3 refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:04:28 +08:00
winlin
af172d9593 refine script, use PROTOCOL as RTMP. 2015-05-23 09:59:24 +08:00