1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

49 commits

Author SHA1 Message Date
winlin
3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 2021-05-31 12:59:21 +08:00
winlin
cec0191b16 Happy 2021 2021-04-20 19:00:14 +08:00
winlin
d01e603b25 Happy 2021 2021-04-16 09:25:55 +08:00
yajun18
cfd6ca8ce5 fix, getsockopt SRTO_MAXBW memory overflow 2020-07-11 21:28:30 +08:00
winlin
4ac8991a8e Update author to runner365 for SRT 2020-03-31 18:10:44 +08:00
winlin
aa20a04abb For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13 2020-03-13 16:56:00 +08:00
runner365
f102a598b8 Merge branch 'develop' into 3.0release.srt.dev 2020-03-12 20:30:59 +08:00
runner365
b9195122cf support all sample rate in aac 2020-03-12 20:30:07 +08:00
winlin
41acf9ca8e For #1631, support sei_filter for SRT. 4.0.11 2020-03-07 22:25:19 +08:00
runner365
a2839aacdf add h264 sei filter 2020-03-07 16:15:36 +08:00
runner365
4242985b36 update only support h264+aac 2020-03-07 15:15:14 +08:00
runner365
40a09958c4 add checking for pes_parse 2020-03-01 19:42:32 +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
bbdbcf173c For #1615, refactor the version and API for SRT. 2020-02-26 09:06:53 +08:00
winlin
04d0620dde For #1615, fix build failed and srt api issue 2020-02-25 13:45: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
1e998678f7
Merge pull request #1615 from runner365/3.0release.srt.dev
update streamid decode for get more encoder such as VMIX
2020-02-25 09:54:33 +08:00
runner365
0dd72e0e5b Merge branch '3.0release.srt.dev' into 3.0release 2020-02-24 12:56:01 +08:00
runner365
bbfa552140 update streamid decode for get more encoder such as VMIX 2020-02-24 12:55:17 +08:00
Alex.CR
ce4123f250
rtmp tcp listen port bugs in srt2rtmp (#1602)
* update srt2rtmp about rtmp listen tcp port

* update srt2rtmp about rtmp listen tcp port
2020-02-13 17:02:54 +08:00
runner365
94741c1676 update srt2rtmp about rtmp listen tcp port 2020-02-13 16:58:35 +08:00
runner365
8e40f9cf22 update srt2rtmp about rtmp listen tcp port 2020-02-13 16:52:26 +08:00
Alex.CR
9dad53691e
solve latency parameter error (#1600)
* solve latency parameter error
2020-02-13 10:54:24 +08:00
runner365
d8419bd4dd solve latency parameter error 2020-02-13 09:58:14 +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
runner365
24f286684e add srt parameter configure 2020-02-12 20:02:55 +08:00
Alex.CR
c2012379af
change srt epoll thread to one thread (#1597)
* 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
2020-02-12 10:23:39 +08:00
runner365
1a1d0e9267 add srt_epoll_clear_usocks 2020-02-12 09:54:07 +08:00
runner365
548c918efb mpegts discard header is not 0x47 2020-02-11 21:36:36 +08:00
runner365
4fdf242e99 change two thread to one thread 2020-02-11 20:37:42 +08:00
Alex.CR
3847807534
solve srt repush bugs (#1596)
* if there isn't srt connect, it needn't epoll wait

* solve repush srt bugs
2020-02-09 11:50:58 +08:00
runner365
1c6203bda2 solve repush srt bugs 2020-02-09 11:09:48 +08:00
runner365
1941f55475 if there isn't srt connect, it needn't epoll wait 2020-02-05 21:21:12 +08:00
winlin
a17c1e5f65 Merge SRT from runner365 2020-01-25 17:24:25 +08:00
runner365
dece458a90 solve rtmp client timeout bugs in srt2rtmp 2020-01-25 16:15:27 +08:00
winlin
b7855d133d Merge remote-tracking branch 'runner365/3.0release.srt.dev' into srt 2020-01-24 16:11:01 +08:00
winlin
307a4315f1 Fix bug, should return error when wrapped 2020-01-23 21:33:59 +08:00
winlin
7c9b31815f Refactor code, add stop for hybrid server to do cleanup. 2020-01-23 21:16:34 +08:00
winlin
2363d258de Refactor hybrid server model 2020-01-23 20:42:50 +08:00
winlin
33c6bf1f8f Refactor SRT, using reverse dependency, SRT depends on APP. 2020-01-23 19:40:40 +08:00
runner365
06e7a20b5f update streamid decode 2020-01-23 17:19:06 +08:00
runner365
d7437834d4 update is_streamid_valid 2020-01-23 16:12:22 +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
1481928b53 reject repeated srt pusher connection 2020-01-15 10:30:20 +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