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

414 commits

Author SHA1 Message Date
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
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
8b4f84e336 fix push.gb28181.conf, gb28181conn repeat call serve() 2020-03-20 10:38:38 +08:00
xialixin
cbe9c1dabc Support gb28181 sip over udp, ps steam over rtp 2020-03-20 00:01:48 +08:00
winlin
a135eb2144 Merge SRS3 2020-03-14 14:39:11 +08:00
winlin
88336b1f5e Remove KAFKA config, because it's removed from code 2020-03-14 14:38:26 +08:00
winlin
1382337cb4 Merge SRS3 2020-03-12 22:42:33 +08:00
winlin
9b663c070a Fix #1635, support auto reaload config by inotify. 3.0.129 2020-03-12 18:14:23 +08:00
winlin
b33751e2c1 Merge SRS3 2020-03-12 12:18:15 +08:00
winlin
ed41ca867b For #1594, detect and disable daemon for docker. 3.0.127 2020-03-12 10:11:41 +08:00
winlin
6a765ab849 Merge SRS3 2020-03-11 19:45:01 +08:00
winlin
c61c2a939f For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 2020-03-11 19:33:55 +08:00
runner365
7f4cc6221c 1,solve audio timestamp bugs;2,solve video dts increase bugs 2020-02-29 16:47:20 +08:00
runner365
ed1a3aa37c Merge branch 'develop' into 3.0release.srt.dev 2020-02-26 17:46:44 +08:00
runner365
4bd37d43b4 solve dts==0 bugs; solve large aac 2930bytes timestamp bugs 2020-02-26 11:14:05 +08:00
winlin
90afd06c85 For #1615, support default app(live) for vmix SRT. 4.0.9 2020-02-25 13:22:44 +08:00
winlin
ef2b123325 Merge branch '3.0release' into 4.0release 2020-02-21 23:52:04 +08:00
winlin
20b9d6ab02 For #1598, support SLB health checking by TCP. 3.0.123 2020-02-21 23:51:40 +08:00
winlin
388ad61cdc Merge branch '3.0release' into 4.0release 2020-02-18 23:38:52 +08:00
winlin
dc0f804452 For #1579, support start/final wait for gracefully quit. 3.0.121 2020-02-18 23:37:11 +08:00
winlin
0c48c42f36 Merge branch '3.0release' into 4.0release 2020-02-18 22:15:29 +08:00
winlin
58b40478b6 For #1579, support force gracefully quit. 3.0.120 2020-02-18 22:15:12 +08:00
winlin
eefd74e0e4 Merge branch '3.0release' into develop 2020-02-18 20:25:07 +08:00
winlin
3c597545b1 For #1579, support gracefully quit. 3.0.119 2020-02-18 19:59:47 +08:00
winlin
8b7fbac7d4 SRT supports detail config for DynamicConfig. 4.0.4 2020-02-13 12:17:09 +08:00
Alex.CR
5f7d23f123
add srt parameter configure (#1599) 
* if there isn't srt connect, it needn't epoll wait

* solve repush srt bugs

* change two thread to one thread

* mpegts discard header is not 0x47

* add srt_epoll_clear_usocks

* add srt parameter configure
 2020-02-12 21:03:26 +08:00
winlin
bdc7973596 Merge branch '3.0release' into develop 2020-02-05 14:18:07 +08:00
winlin
f6fa889393 For #1592, default ff_log_level to info 2020-02-05 13:20:37 +08:00
winlin
c6d914bc13 Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115 2020-02-05 13:04:00 +08:00
winlin
c50c51889a For #1592, support ff_log_level and default to warning 2020-02-05 12:32:15 +08:00
winlin
88c9c13707 Update readme for SRT 2020-01-26 14:17:42 +08:00
winlin
2775a391e0 Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108 2020-01-25 20:03:22 +08:00
winlin
bbc7023f85 Merge SRS3 2020-01-25 15:05:52 +08:00
winlin
235c889e14 Update config 2020-01-24 15:35:14 +08:00
winlin
87ba204a42 Update doc for SRT url. 2020-01-23 18:25:44 +08:00
winlin
d88d422794 Update doc for SRT. 2020-01-23 16:49:05 +08:00
winlin
c7f6eef4ac Refine config file, link to issue. 2020-01-23 11:51:35 +08:00
runner365
03ef01c635 update configure 2020-01-22 10:59:50 +08:00
runner365
746d188e6f update srt.conf 2020-01-21 19:23:38 +08:00
runner365
5c5fd805c5 add srt mpegts to rtmp 2020-01-21 19:20:09 +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
8a28a11648 For #299, increase dash segment size for avsync issue. 3.0.89 2019-12-29 18:21:45 +08:00
winlin
d7078a72d4 For #1520, add TODO list for configing server itself in coworker. 2019-12-19 14:15:21 +08:00
winlin
acfeb8a66f Fix #1520, #1223, bug for origin cluster 3+ servers. 3.0.74 2019-12-19 14:04:26 +08:00
winlin
cef7ec79b3 Detect whether flash enabled for srs-bwt. 2019-12-18 11:50:43 +08:00
winlin
6f453e7f46 For #547, #1506, default hls_dts_directly to on. 3.0.71 2019-12-12 16:51:34 +08:00
winlin
d908ee73db Make the hls_dipose more specific 2019-12-10 16:48:35 +08:00