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

5159 commits

This branch
This branch
All branches
Author SHA1 Message Date
xiaozhihong
30d8b2209f parse sdp 2020-03-02 22:47:40 +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
3ce5f6ce6a Merge branch 'develop' of https://github.com/ossrs/srs into develop 2020-02-19 16:40:13 +08:00
winlin
ad3cfbfd2c For #1579, support start/final wait for gracefully quit. 4.0.6 2020-02-18 23:39: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
d87f58a611 For #1579, support gracefully quit and force to. 4.0.5 2020-02-18 22:16:28 +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
e6c329293c Refine log 2020-02-18 15:07:15 +08:00
winlin
f4c7b882c5 For #1579, define signals for fast/grace quit and upgrade 2020-02-18 09:53:40 +08:00
xiaozhihong
7c270370b0 Merge branch 'develop' of https://github.com/ossrs/srs into develop 2020-02-17 21:49:43 +08:00
winlin
cac44ac604
Merge pull request #1611 from xialixin/develop 
Fix checking the completion of one frame data in RTSP RTP stream
 2020-02-17 18:46:49 +08:00
夏立新
df3ec15cd1 Fix checking the completion of one frame data in RTSP RTP stream 2020-02-17 18:08:16 +08:00
xiaozhihong
2b299a8e30 Merge branch 'develop' of https://github.com/ossrs/srs into develop 2020-02-17 15:38:26 +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
winlin
5be69d290f For #1601, flush async on_dvr/on_hls events before stop. 3.0.118 2020-02-17 11:53:04 +08:00
winlin
4e7e9809f3 Fix bash script bug for macOS, eventhough we don't support it. 2020-02-16 22:35:40 +08:00
xiaozhihong
7c8a35aea9 use libco instead of state-thread(st), still have some bug 2020-02-16 21:07:54 +08:00
winlin
bf45d8e23b Merge branch '3.0release' into develop 2020-02-16 14:11:42 +08:00
winlin
304b92cc36 Update maintainers 2020-02-16 13:41:47 +08:00
winlin
8079564077 Update maintainers 2020-02-16 13:39:25 +08:00
winlin
0723b36f0e Merge branch '3.0release' into develop 2020-02-16 13:31:54 +08:00
winlin
1604fcf35a Update authors 2020-02-16 13:31:03 +08:00
winlin
16173194b9 Release 3.0-beta1, r3.0b1, 3.0.117 2020-02-14 23:05:54 +08:00
winlin
131acf5bb0 For #1595, migrating streaming from ossrs.net to r.ossrs.net. 3.0.117 2020-02-14 23:04:01 +08:00
winlin
4276bea463 Migrating streaming service from ossrs.net to r.ossrs.net 2020-02-14 22:00:58 +08:00
winlin
23324cde31 Migrating streaming service from ossrs.net to r.ossrs.net 2020-02-14 21:57:02 +08:00
winlin
21c2cb6512 Update issue template 2020-02-14 11:17:19 +08:00
winlin
51d6c367f5 Merge remote-tracking branch 'runner365/3.0release' into develop 2020-02-13 17:05:18 +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
76204fa2ba Merge remote-tracking branch 'srs/develop' into 3.0release 2020-02-13 16:52:47 +08:00
runner365
8e40f9cf22 update srt2rtmp about rtmp listen tcp port 2020-02-13 16:52:26 +08:00
winlin
8b7fbac7d4 SRT supports detail config for DynamicConfig. 4.0.4 2020-02-13 12:17:09 +08:00
winlin
37fdecba3c Merge remote-tracking branch 'runner365/3.0release' into develop 2020-02-13 11:06:19 +08:00
Alex.CR
9dad53691e
solve latency parameter error (#1600) 
* solve latency parameter error
 2020-02-13 10:54:24 +08:00
runner365
ca1efc6a34 solve merge problem 2020-02-13 10:25:13 +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
6f4c124f58 solve merge confict 2020-02-12 10:19:30 +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