Skip to content

SRT: Support Coroutine Native SRT over ST. #3010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 41 commits into from
Closed

SRT: Support Coroutine Native SRT over ST. #3010

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
aff6102
Refine SRT code, with StateThread adpater
xiaozhihong Apr 15, 2022
193fcbd
SRT: Support debugging with CLion.
winlinvip Apr 16, 2022
a499a8c
SRT: Eliminate unused files for SRT.
winlinvip Apr 16, 2022
85e9581
SRT: check srt_connect return value
xiaozhihong Apr 16, 2022
7352bfe
SRT: support rtmp to srt
xiaozhihong Apr 20, 2022
5d33eec
SRT: fix utest failed
xiaozhihong Apr 22, 2022
8cea168
SRT: Fix cmake bug, quit if error.
winlinvip May 23, 2022
05d3d96
SRT: Update full.conf for new configs.
winlinvip May 23, 2022
4ce091e
SRT: Update full.conf for review.
winlinvip May 23, 2022
86d48c4
SRT: Add srt vhost section to full.conf.
winlinvip May 25, 2022
738e110
SRT: Refine parse SRT listen ip and port.
winlinvip May 28, 2022
bc59917
SRT: Refine the schedule resolution to 10ms if idle.
winlinvip May 28, 2022
f5101ae
SRT: Initialize SRT eventloop in adapter.
winlinvip May 28, 2022
16063d1
SRT: Refine get_srt_poller to poller.
winlinvip May 28, 2022
a7725f6
SRT: Refine the SRT socket code.
winlinvip May 28, 2022
14fb187
SRT: Add SRT option annotation in full.conf
xiaozhihong May 30, 2022
8558fb9
SRT: Tsbpdmode default on
xiaozhihong May 30, 2022
a3e0a3c
SRT: refine int to srs_utime_t in srt timeout config
xiaozhihong May 30, 2022
c096dfa
SRT: add option peer_idle_timeout in full.conf
xiaozhihong May 30, 2022
40725ab
SRT: use srs code style in function defination
xiaozhihong May 30, 2022
b217eaf
SRT: remove mix_correct
xiaozhihong May 30, 2022
c4abac8
SRT: remove rtmp_to_srt
xiaozhihong May 30, 2022
563cb81
SRT: Rename srs_service_st_srt to srs_protocol_srt
winlinvip Jun 7, 2022
083b8ce
SRT: Wrap SRT stat object.
winlinvip Jun 7, 2022
031ea96
SRT: Extract ISrsSrtPoller to hide SRT_EPOLL_EVENT
winlinvip Jun 7, 2022
248ce93
SRT: Hide srt implements from API.
winlinvip Jun 7, 2022
99a6d72
SRT: Undo extract of fetch_or_create_source and change mode_ to local.
winlinvip Jun 8, 2022
b2b6087
SRT: Refine packet error handler.
winlinvip Jun 8, 2022
a89c725
SRT: Add todo for coroutine yield.
winlinvip Jun 9, 2022
5933942
SRT: Merge develop, rename bridger to bridge.
winlinvip Jun 9, 2022
2668fec
SRT: Merge develop, rename filename in protocol.
winlinvip Jun 9, 2022
85591e9
SRT: Merge develop, prefix for protocol files.
winlinvip Jun 9, 2022
d57fd6b
Merge branch 'develop' into feature/srt
winlinvip Jun 9, 2022
93d0cfb
SRT: Merge develop, fix build fail.
winlinvip Jun 9, 2022
4c32b52
SRT: Refine code, remove SrsSrtListenerType
winlinvip Jun 10, 2022
424f5ec
SRT: Change bridges to bridge.
winlinvip Jun 10, 2022
f933e7f
SRT: move accept log into srt conn cycle
xiaozhihong Jun 12, 2022
9d97402
SRT: readd mix_correct, compatible old srt conf
xiaozhihong Jun 12, 2022
b7aad03
SRT: add srs_core_lock, support scope lock guard
xiaozhihong Jun 12, 2022
edc291a
SRT: add srt log handle, srs log supoort multithread
xiaozhihong Jun 12, 2022
d7dcf6d
SRT: Refine the lock for log.
winlinvip Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SRT: Update full.conf for new configs.
  • Loading branch information
@winlinvip
winlinvip committed May 23, 2022
commit 05d3d963d0893a45df310ad60fbb70765d25fd4f
15 changes: 9 additions & 6 deletions trunk/conf/full.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ stream_caster {
#############################################################################################
# SRT server section
#############################################################################################
# @doc https://github.com/ossrs/srs/issues/1147#issuecomment-577607026
# @doc https://github.com/ossrs/srs/issues/1147#usage
srt_server {
# whether SRT server is enabled.
# default: off
Expand All @@ -364,11 +364,14 @@ srt_server {
# https://github.com/ossrs/srs/wiki/v4_EN_SRTParams
maxbw 1000000000;
connect_timeout 4000;
peerlatency 300;
recvlatency 300;
# Default app for vmix, see https://github.com/ossrs/srs/pull/1615
# default: live
default_app live;
peerlatency 0;
recvlatency 0;
# TODO: FIXME: Add comments.
latency 0;
tsbpdmode off;
tlpktdrop off;
sendbuf 2000000;
recvbuf 2000000;
}

#############################################################################################
Expand Down
10 changes: 5 additions & 5 deletions trunk/conf/srt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ http_server {

srt_server {
enabled on;
tsbpdmode off;
tlpktdrop off;
latency 0;
sendbuf 2000000;
recvbuf 2000000;
listen 10080;
maxbw 1000000000;
connect_timeout 4000;
peerlatency 0;
recvlatency 0;
latency 0;
tsbpdmode off;
tlpktdrop off;
sendbuf 2000000;
recvbuf 2000000;
}

# @doc https://github.com/ossrs/srs/issues/1147#issuecomment-577607026
Expand Down