1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

5051 commits

Author SHA1 Message Date
Alex.CR
3615ecc092
Merge pull request #3 from ossrs/feature/srt
Refactor the hybrid model for SRT.
2020-01-26 01:01:00 -06:00
winlin
a17c1e5f65 Merge SRT from runner365 2020-01-25 17:24:25 +08:00
runner365
8d277c6e8b solve merge problem 2020-01-25 16:24:04 +08:00
runner365
dece458a90 solve rtmp client timeout bugs in srt2rtmp 2020-01-25 16:15:27 +08:00
winlin
bbc7023f85 Merge SRS3 2020-01-25 15:05:52 +08:00
winlin
978d5e993b Fix #1108, reap DVR tmp file when unpublish. 3.0.106 2020-01-25 15:04:34 +08:00
winlin
a1ca3774a4 Merge SRS2 2020-01-25 13:08:53 +08:00
winlin
6864e1ca6d Release 2.0r8, 2.0.272 2020-01-25 12:56:01 +08:00
winlin
5d0833fcc3 Add author runner365 2020-01-24 18:41:09 +08:00
winlin
fddfbdde5f Fix #1147, support SRT(Secure Reliable Transport). 4.0.1 2020-01-24 16:16:16 +08:00
winlin
19df3c7976 Merge branch 'srt' into develop 2020-01-24 16:11:16 +08:00
winlin
b7855d133d Merge remote-tracking branch 'runner365/3.0release.srt.dev' into srt 2020-01-24 16:11:01 +08:00
winlin
5f174552f3 Merge SRT 2020-01-24 16:10:40 +08:00
winlin
db1e06d3c9 Update README 2020-01-24 16:03:32 +08:00
winlin
235c889e14 Update config 2020-01-24 15:35:14 +08:00
winlin
e3169a080b Refactor SRT build, use libsrt.a static library 2020-01-24 07:06:30 +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
db5788b205 Update README for SRT 2020-01-23 20:47:32 +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
winlin
87ba204a42 Update doc for SRT url. 2020-01-23 18:25:44 +08:00
winlin
1959d1d920 Extract hybrid server for SRT 2020-01-23 18:21:11 +08:00
winlin
225c830971 Refine main run process 2020-01-23 17:44:36 +08:00
runner365
06e7a20b5f update streamid decode 2020-01-23 17:19:06 +08:00
winlin
d88d422794 Update doc for SRT. 2020-01-23 16:49:05 +08:00
runner365
d7437834d4 update is_streamid_valid 2020-01-23 16:12:22 +08:00
Alex.CR
d792ac2e57
Merge pull request #1 from ossrs/feature/srt
Refine code before merge to SRS.
2020-01-23 01:27:44 -06:00
winlin
bc26df4893 Remove noused debug function srs_trace_data 2020-01-23 14:44:30 +08:00
winlin
aacf519169 Revert log for forwarder in source 2020-01-23 14:42:06 +08:00
winlin
a7b8695cb0 Refactor code, include without path 2020-01-23 14:33:11 +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
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
winlin
c7f6eef4ac Refine config file, link to issue. 2020-01-23 11:51:35 +08:00
winlin
65e8835fb5 Ignore .vscode in git. 2020-01-23 09:24:41 +08:00
winlin
d28e82962d Ignore .vscode in git. 2020-01-23 09:17:01 +08:00
winlin
abac04af6f Start developing SRS4(Leo) 2020-01-23 09:07:04 +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
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
winlin
1b68b39d97 Merge branch '3.0release' into develop 2020-01-21 16:15:12 +08:00
winlin
6107db91f5 Release 3.0 alpha9, 3.0a9, 3.0.105 2020-01-21 16:14:15 +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