diff --git a/trunk/conf/clion-ingest.conf b/trunk/conf/clion-ingest.conf index 681822d12..246894d22 100644 --- a/trunk/conf/clion-ingest.conf +++ b/trunk/conf/clion-ingest.conf @@ -25,7 +25,7 @@ rtc_server { # The $CANDIDATE means fetch from env, if not configed, use * as default. # # The * means retrieving server IP automatically, from all network interfaces, - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } diff --git a/trunk/conf/clion.conf b/trunk/conf/clion.conf index 290289744..eed8cd2ee 100644 --- a/trunk/conf/clion.conf +++ b/trunk/conf/clion.conf @@ -25,7 +25,7 @@ rtc_server { # The $CANDIDATE means fetch from env, if not configed, use * as default. # # The * means retrieving server IP automatically, from all network interfaces, - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } @@ -46,9 +46,9 @@ srt_server { vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/console.conf b/trunk/conf/console.conf index 4c6a65098..0c3c11bdb 100644 --- a/trunk/conf/console.conf +++ b/trunk/conf/console.conf @@ -16,7 +16,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -29,9 +29,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } } diff --git a/trunk/conf/dash.conf b/trunk/conf/dash.conf index b9c6d0fdb..35859a631 100644 --- a/trunk/conf/dash.conf +++ b/trunk/conf/dash.conf @@ -1,5 +1,5 @@ # the config for srs to delivery dash -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-dash +# @see https://ossrs.io/lts/en-us/docs/v7/doc/sample-dash # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/docker.conf b/trunk/conf/docker.conf index 3d0986087..73a6a172c 100644 --- a/trunk/conf/docker.conf +++ b/trunk/conf/docker.conf @@ -19,7 +19,7 @@ http_server { rtc_server { enabled on; listen 8000; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -32,9 +32,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } } diff --git a/trunk/conf/dvr.mp4.conf b/trunk/conf/dvr.mp4.conf index b527edcca..67c0c9fb5 100644 --- a/trunk/conf/dvr.mp4.conf +++ b/trunk/conf/dvr.mp4.conf @@ -1,5 +1,5 @@ # the config for srs to dvr in session mode -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr +# @see https://ossrs.io/lts/en-us/docs/v7/doc/dvr # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/dvr.path.conf b/trunk/conf/dvr.path.conf index a19503896..06b55f4bc 100644 --- a/trunk/conf/dvr.path.conf +++ b/trunk/conf/dvr.path.conf @@ -1,6 +1,5 @@ # the config for srs to dvr in custom path. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr#custom-path -# @see https://ossrs.io/lts/en-us/docs/v4/doc/dvr#custom-path +# @see https://ossrs.io/lts/en-us/docs/v7/doc/dvr#custom-path # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/dvr.segment.conf b/trunk/conf/dvr.segment.conf index c8ec51960..7f6a6f981 100644 --- a/trunk/conf/dvr.segment.conf +++ b/trunk/conf/dvr.segment.conf @@ -1,5 +1,5 @@ # the config for srs to dvr in segment mode -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr +# @see https://ossrs.io/lts/en-us/docs/v7/doc/dvr # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/dvr.session.conf b/trunk/conf/dvr.session.conf index d8c2927db..73c7df312 100644 --- a/trunk/conf/dvr.session.conf +++ b/trunk/conf/dvr.session.conf @@ -1,5 +1,5 @@ # the config for srs to dvr in session mode -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr +# @see https://ossrs.io/lts/en-us/docs/v7/doc/dvr # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/edge.conf b/trunk/conf/edge.conf index 71b03e3a9..0e55b99aa 100644 --- a/trunk/conf/edge.conf +++ b/trunk/conf/edge.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/edge +# @see https://ossrs.io/lts/en-us/docs/v7/doc/edge # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/edge.token.traverse.conf b/trunk/conf/edge.token.traverse.conf index 9b75a3dcc..4b01608d7 100644 --- a/trunk/conf/edge.token.traverse.conf +++ b/trunk/conf/edge.token.traverse.conf @@ -1,5 +1,5 @@ # the config for srs for token traverse authentication -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/drm +# @see https://ossrs.io/lts/en-us/docs/v7/doc/drm # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/edge2.conf b/trunk/conf/edge2.conf index 0b07c73b2..3e2b2a041 100644 --- a/trunk/conf/edge2.conf +++ b/trunk/conf/edge2.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/edge +# @see https://ossrs.io/lts/en-us/docs/v7/doc/edge # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/exec.conf b/trunk/conf/exec.conf index c6ea9ea75..87893dc81 100644 --- a/trunk/conf/exec.conf +++ b/trunk/conf/exec.conf @@ -1,5 +1,5 @@ # the config for srs to support nginx-rtmp exec. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/nginx-exec +# @see https://ossrs.io/lts/en-us/docs/v7/doc/nginx-exec # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/ffmpeg.transcode.conf b/trunk/conf/ffmpeg.transcode.conf index 475f38ce4..24c3cbf91 100644 --- a/trunk/conf/ffmpeg.transcode.conf +++ b/trunk/conf/ffmpeg.transcode.conf @@ -1,5 +1,5 @@ # the config for srs use ffmpeg to transcode -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-ffmpeg +# @see https://ossrs.io/lts/en-us/docs/v7/doc/sample-ffmpeg # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/force.daemon.conf b/trunk/conf/force.daemon.conf index e36b46ff9..ebe81562c 100644 --- a/trunk/conf/force.daemon.conf +++ b/trunk/conf/force.daemon.conf @@ -13,7 +13,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -26,9 +26,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/forward.backend.conf b/trunk/conf/forward.backend.conf index 61a6c2d86..eefc8fc36 100644 --- a/trunk/conf/forward.backend.conf +++ b/trunk/conf/forward.backend.conf @@ -1,5 +1,5 @@ # the config for srs to forward to slave service -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-forward +# @see https://ossrs.io/lts/en-us/docs/v7/doc/forward # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/forward.master.conf b/trunk/conf/forward.master.conf index 362cbae37..873ebd651 100644 --- a/trunk/conf/forward.master.conf +++ b/trunk/conf/forward.master.conf @@ -1,5 +1,5 @@ # the config for srs to forward -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-forward +# @see https://ossrs.io/lts/en-us/docs/v7/doc/forward # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/forward.slave.conf b/trunk/conf/forward.slave.conf index ab3333cc7..9cce1143d 100644 --- a/trunk/conf/forward.slave.conf +++ b/trunk/conf/forward.slave.conf @@ -1,5 +1,5 @@ # the config for srs to forward -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-forward +# @see https://ossrs.io/lts/en-us/docs/v7/doc/forward # @see full.conf for detail config. listen 19350; diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index a84309c22..78ec9e261 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -309,8 +309,7 @@ srt_server { # Overwrite by env SRS_SRT_SERVER_LISTEN listen 10080; # For detail parameters, please read wiki: - # @see https://ossrs.net/lts/zh-cn/docs/v5/doc/srt-params - # @see https://ossrs.io/lts/en-us/docs/v5/doc/srt-params + # @see https://ossrs.io/lts/en-us/docs/v7/doc/srt#config # The maxbw is the max bandwidth of the sender side. # -1: Means the biggest bandwidth is infinity. # 0: Means the bandwidth is determined by SRTO_INPUTBW. @@ -441,7 +440,7 @@ rtc_server { # http://locahost:1985/rtc/v1/whip/?app=live&stream=livestream&eip=192.168.3.11 # http://locahost:1985/rtc/v1/whip/?app=live&stream=livestream&eip=192.168.3.11:18000 # @remark For Firefox, the candidate MUST be IP, MUST NOT be DNS name, see https://bugzilla.mozilla.org/show_bug.cgi?id=1239006 - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate # Overwrite by env SRS_RTC_SERVER_CANDIDATE # default: * candidate *; @@ -677,10 +676,10 @@ stream_caster { # SIP server for GB28181. Please note that this is only a demonstrated SIP server, please never use it in your # online production environment. Instead please use [jsip](https://github.com/usnistgov/jsip) and there is a demo # [srs-sip](https://github.com/ossrs/srs-sip) also base on it, for more information please see project - # [GB: External SIP](https://ossrs.net/lts/zh-cn/docs/v6/doc/gb28181#external-sip). + # [GB: External SIP](https://ossrs.io/lts/en-us/docs/v7/doc/gb28181#external-sip). sip { # Whether enable embedded SIP server. Please disable it if you want to use your own SIP server, see - # [GB: External SIP](https://ossrs.net/lts/zh-cn/docs/v6/doc/gb28181#external-sip). + # [GB: External SIP](https://ossrs.io/lts/en-us/docs/v7/doc/gb28181#external-sip). # Default: on enabled on; # The SIP listen port, for TCP protocol. @@ -1036,7 +1035,7 @@ vhost cluster.srs.com { # it's strongly recommend to open the debug_srs_upnode, # when connect to upnode, it will take the debug info, # for example, the id, source id, pid. - # please see https://ossrs.net/lts/zh-cn/docs/v4/doc/log + # please see https://ossrs.io/lts/en-us/docs/v7/doc/log # default: on debug_srs_upnode on; @@ -1048,7 +1047,7 @@ vhost cluster.srs.com { # For origin (mode local) cluster, the co-worker's HTTP APIs. # This origin will connect to co-workers and communicate with them. - # please see https://ossrs.io/lts/en-us/docs/v4/doc/origin-cluster + # please see https://ossrs.io/lts/en-us/docs/v7/doc/origin-cluster#legacy # TODO: FIXME: Support reload. coworkers 127.0.0.1:9091 127.0.0.1:9092; @@ -1855,8 +1854,8 @@ vhost hls.srs.com { # [timestamp],replace this const to current UNIX timestamp in ms. # [seq], the sequence number of ts. # [duration], replace this const to current ts duration. - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr#custom-path - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-hls#hls-config + # @see https://ossrs.io/lts/en-us/docs/v7/doc/dvr#custom-path + # @see https://ossrs.io/lts/en-us/docs/v7/doc/hls#config # Overwrite by env SRS_VHOST_HLS_HLS_TS_FILE for all vhosts. # default: [app]/[stream]-[seq].ts hls_ts_file [app]/[stream]-[seq].ts; @@ -1976,8 +1975,7 @@ vhost hls.srs.com { # on_hls, never config in here, should config in http_hooks. # for the hls http callback, @see http_hooks.on_hls of vhost hooks.callback.srs.com - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-hls#http-callback - # @see https://ossrs.io/lts/en-us/docs/v4/doc/delivery-hls#http-callback + # @see https://ossrs.io/lts/en-us/docs/v7/doc/hls#http-callback # on_hls_notify, never config in here, should config in http_hooks. # we support the variables to generate the notify url: @@ -1986,8 +1984,7 @@ vhost hls.srs.com { # [param], replace with the param. # [ts_url], replace with the ts url. # for the hls http callback, @see http_hooks.on_hls_notify of vhost hooks.callback.srs.com - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-hls#on-hls-notify - # @see https://ossrs.io/lts/en-us/docs/v4/doc/delivery-hls#on-hls-notify + # @see https://ossrs.io/lts/en-us/docs/v7/doc/hls#on-hls-notify } } # the vhost with hls disabled. @@ -2082,8 +2079,7 @@ vhost dvr.srs.com { # dvr_path ./objs/nginx/html/[app]/[stream].[timestamp].mp4; # => # dvr_path ./objs/nginx/html/live/livestream.1420254068776.mp4; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr#custom-path - # @see https://ossrs.io/lts/en-us/docs/v4/doc/dvr#custom-path + # @see https://ossrs.io/lts/en-us/docs/v7/doc/dvr#custom-path # segment,session apply it. # Overwrite by env SRS_VHOST_DVR_DVR_PATH for all vhosts. # default: ./objs/nginx/html/[app]/[stream].[timestamp].flv @@ -2119,8 +2115,8 @@ vhost dvr.srs.com { # on_dvr, never config in here, should config in http_hooks. # for the dvr http callback, @see http_hooks.on_dvr of vhost hooks.callback.srs.com - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr#http-callback - # @see https://ossrs.io/lts/en-us/docs/v4/doc/dvr#http-callback + # @see https://ossrs.io/lts/en-us/docs/v7/doc/dvr#http-callback + # @see https://ossrs.io/lts/en-us/docs/v7/doc/dvr#http-callback } } diff --git a/trunk/conf/gb28181-without-sip.conf b/trunk/conf/gb28181-without-sip.conf index 1b19326b4..41523c198 100644 --- a/trunk/conf/gb28181-without-sip.conf +++ b/trunk/conf/gb28181-without-sip.conf @@ -30,16 +30,16 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/gb28181.conf b/trunk/conf/gb28181.conf index 45d329903..16c9e8df8 100644 --- a/trunk/conf/gb28181.conf +++ b/trunk/conf/gb28181.conf @@ -12,7 +12,7 @@ stream_caster { sip { enabled on; listen 5060; - # @see https://ossrs.net/lts/zh-cn/docs/v5/doc/gb28181#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/gb28181#config-candidate candidate $CANDIDATE; } } @@ -33,16 +33,16 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/go-oryx-edge.conf b/trunk/conf/go-oryx-edge.conf index 42e5b4885..909e9794a 100644 --- a/trunk/conf/go-oryx-edge.conf +++ b/trunk/conf/go-oryx-edge.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/edge +# @see https://ossrs.io/lts/en-us/docs/v7/doc/edge # @see full.conf for detail config. listen 19351; diff --git a/trunk/conf/go-oryx-edge2.conf b/trunk/conf/go-oryx-edge2.conf index 288a17f20..9cc7d12db 100644 --- a/trunk/conf/go-oryx-edge2.conf +++ b/trunk/conf/go-oryx-edge2.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/edge +# @see https://ossrs.io/lts/en-us/docs/v7/doc/edge # @see full.conf for detail config. listen 19352; diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf index 91bff6ee7..fb3f92966 100644 --- a/trunk/conf/hls.conf +++ b/trunk/conf/hls.conf @@ -1,5 +1,5 @@ # the config for srs to delivery hls -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-hls +# @see https://ossrs.io/lts/en-us/docs/v7/doc/hls # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/hls.realtime.conf b/trunk/conf/hls.realtime.conf index 843284eb7..3b188c0b4 100644 --- a/trunk/conf/hls.realtime.conf +++ b/trunk/conf/hls.realtime.conf @@ -1,5 +1,5 @@ # the config for srs to delivery realtime RTMP stream -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-realtime +# @see https://ossrs.io/lts/en-us/docs/v7/doc/sample-realtime # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.aac.live.conf b/trunk/conf/http.aac.live.conf index 7509d5a94..191e1d376 100644 --- a/trunk/conf/http.aac.live.conf +++ b/trunk/conf/http.aac.live.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to aac live stream. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-http-flv +# @see https://ossrs.io/lts/en-us/docs/v7/doc/flv # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.api.dedicated.conf b/trunk/conf/http.api.dedicated.conf index cb1c412c7..896a04dbf 100644 --- a/trunk/conf/http.api.dedicated.conf +++ b/trunk/conf/http.api.dedicated.conf @@ -17,7 +17,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -30,9 +30,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/http.api.one.port.conf b/trunk/conf/http.api.one.port.conf index 5a51c5110..5a6f0b327 100644 --- a/trunk/conf/http.api.one.port.conf +++ b/trunk/conf/http.api.one.port.conf @@ -17,7 +17,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -30,9 +30,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/http.api.one.port2.conf b/trunk/conf/http.api.one.port2.conf index a591c8705..e7f31d35e 100644 --- a/trunk/conf/http.api.one.port2.conf +++ b/trunk/conf/http.api.one.port2.conf @@ -29,7 +29,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -42,9 +42,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/http.flv.live.conf b/trunk/conf/http.flv.live.conf index bef52451d..d8f83453e 100644 --- a/trunk/conf/http.flv.live.conf +++ b/trunk/conf/http.flv.live.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to flv live stream. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-http-flv +# @see https://ossrs.io/lts/en-us/docs/v7/doc/flv # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.flv.live.edge1.conf b/trunk/conf/http.flv.live.edge1.conf index fd3fe0aae..0ec999306 100644 --- a/trunk/conf/http.flv.live.edge1.conf +++ b/trunk/conf/http.flv.live.edge1.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to flv live stream. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-http-flv +# @see https://ossrs.io/lts/en-us/docs/v7/doc/flv # @see full.conf for detail config. listen 19351; diff --git a/trunk/conf/http.flv.live.edge2.conf b/trunk/conf/http.flv.live.edge2.conf index 01e3591a0..72436bb71 100644 --- a/trunk/conf/http.flv.live.edge2.conf +++ b/trunk/conf/http.flv.live.edge2.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to flv live stream. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-http-flv +# @see https://ossrs.io/lts/en-us/docs/v7/doc/flv # @see full.conf for detail config. listen 19352; diff --git a/trunk/conf/http.hls.conf b/trunk/conf/http.hls.conf index 2405717fa..cd06d737b 100644 --- a/trunk/conf/http.hls.conf +++ b/trunk/conf/http.hls.conf @@ -1,5 +1,5 @@ # the config for srs to delivery hls -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-hls +# @see https://ossrs.io/lts/en-us/docs/v7/doc/hls # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.mp3.live.conf b/trunk/conf/http.mp3.live.conf index 7815c437f..98bea0e23 100644 --- a/trunk/conf/http.mp3.live.conf +++ b/trunk/conf/http.mp3.live.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to mp3 live stream. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-http-flv +# @see https://ossrs.io/lts/en-us/docs/v7/doc/flv # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.ts.live.conf b/trunk/conf/http.ts.live.conf index 47c91ec14..3c21a1ef1 100644 --- a/trunk/conf/http.ts.live.conf +++ b/trunk/conf/http.ts.live.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to ts live stream. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/delivery-http-flv +# @see https://ossrs.io/lts/en-us/docs/v7/doc/flv # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/https.docker.conf b/trunk/conf/https.docker.conf index dda3aa970..881ccceec 100644 --- a/trunk/conf/https.docker.conf +++ b/trunk/conf/https.docker.conf @@ -32,7 +32,7 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } @@ -46,9 +46,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/https.rtc.conf b/trunk/conf/https.rtc.conf index bf9cba122..e93e2ec87 100644 --- a/trunk/conf/https.rtc.conf +++ b/trunk/conf/https.rtc.conf @@ -32,16 +32,16 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } http_remux { diff --git a/trunk/conf/https.rtmp2rtc.conf b/trunk/conf/https.rtmp2rtc.conf index 3444a6776..faf99540b 100644 --- a/trunk/conf/https.rtmp2rtc.conf +++ b/trunk/conf/https.rtmp2rtc.conf @@ -32,16 +32,16 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/https.srs.conf b/trunk/conf/https.srs.conf index dda3aa970..881ccceec 100644 --- a/trunk/conf/https.srs.conf +++ b/trunk/conf/https.srs.conf @@ -32,7 +32,7 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } @@ -46,9 +46,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/ingest.conf b/trunk/conf/ingest.conf index 9551fa810..93e6a6984 100644 --- a/trunk/conf/ingest.conf +++ b/trunk/conf/ingest.conf @@ -1,5 +1,5 @@ # use ffmpeg to ingest file/stream/device to SRS -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-ingest +# @see https://ossrs.io/lts/en-us/docs/v7/doc/ingest # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/ingest.rtsp.conf b/trunk/conf/ingest.rtsp.conf index 8c09a3312..3e1d5e9b2 100644 --- a/trunk/conf/ingest.rtsp.conf +++ b/trunk/conf/ingest.rtsp.conf @@ -1,5 +1,5 @@ # use ffmpeg to ingest file/stream/device to SRS -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-ingest +# @see https://ossrs.io/lts/en-us/docs/v7/doc/ingest # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/log-file.conf b/trunk/conf/log-file.conf index a8e469021..10a3589f2 100644 --- a/trunk/conf/log-file.conf +++ b/trunk/conf/log-file.conf @@ -18,7 +18,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -31,9 +31,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/mp3.rtc.conf b/trunk/conf/mp3.rtc.conf index 6268e0ae5..952f34ad5 100644 --- a/trunk/conf/mp3.rtc.conf +++ b/trunk/conf/mp3.rtc.conf @@ -10,7 +10,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -24,9 +24,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } } diff --git a/trunk/conf/origin.cluster.edge.conf b/trunk/conf/origin.cluster.edge.conf index 86f040707..dfc0a1514 100644 --- a/trunk/conf/origin.cluster.edge.conf +++ b/trunk/conf/origin.cluster.edge.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://ossrs.io/lts/en-us/docs/v4/doc/origin-cluster +# @see https://ossrs.io/lts/en-us/docs/v7/doc/origin-cluster#legacy # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/origin.cluster.serverA.conf b/trunk/conf/origin.cluster.serverA.conf index 7d8d2b357..1c21252b2 100644 --- a/trunk/conf/origin.cluster.serverA.conf +++ b/trunk/conf/origin.cluster.serverA.conf @@ -1,5 +1,5 @@ # the config for srs origin-origin cluster -# @see https://ossrs.io/lts/en-us/docs/v4/doc/origin-cluster +# @see https://ossrs.io/lts/en-us/docs/v7/doc/origin-cluster#legacy # @see full.conf for detail config. listen 19350; diff --git a/trunk/conf/origin.cluster.serverB.conf b/trunk/conf/origin.cluster.serverB.conf index 3d9e3339f..410d69356 100644 --- a/trunk/conf/origin.cluster.serverB.conf +++ b/trunk/conf/origin.cluster.serverB.conf @@ -1,5 +1,5 @@ # the config for srs origin-origin cluster -# @see https://ossrs.io/lts/en-us/docs/v4/doc/origin-cluster +# @see https://ossrs.io/lts/en-us/docs/v7/doc/origin-cluster#legacy # @see full.conf for detail config. listen 19351; diff --git a/trunk/conf/origin.cluster.serverC.conf b/trunk/conf/origin.cluster.serverC.conf index a4cfb2815..df161a2f2 100644 --- a/trunk/conf/origin.cluster.serverC.conf +++ b/trunk/conf/origin.cluster.serverC.conf @@ -1,5 +1,5 @@ # the config for srs origin-origin cluster -# @see https://ossrs.io/lts/en-us/docs/v4/doc/origin-cluster +# @see https://ossrs.io/lts/en-us/docs/v7/doc/origin-cluster#legacy # @see full.conf for detail config. listen 19352; diff --git a/trunk/conf/origin.conf b/trunk/conf/origin.conf index 83f6846ab..df002ac5c 100644 --- a/trunk/conf/origin.conf +++ b/trunk/conf/origin.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/edge +# @see https://ossrs.io/lts/en-us/docs/v7/doc/edge # @see full.conf for detail config. listen 19350; diff --git a/trunk/conf/origin.hls.only1.conf b/trunk/conf/origin.hls.only1.conf index 088d146a2..f84d08190 100644 --- a/trunk/conf/origin.hls.only1.conf +++ b/trunk/conf/origin.hls.only1.conf @@ -1,5 +1,5 @@ # the config for isolated origin server to reuse port. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/reuse-port +# @see https://ossrs.io/lts/en-us/docs/v7/doc/reuse-port # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/origin.hls.only2.conf b/trunk/conf/origin.hls.only2.conf index 7989d488d..efb09c0a3 100644 --- a/trunk/conf/origin.hls.only2.conf +++ b/trunk/conf/origin.hls.only2.conf @@ -1,5 +1,5 @@ # the config for isolated origin server to reuse port. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/reuse-port +# @see https://ossrs.io/lts/en-us/docs/v7/doc/reuse-port # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/origin1-for-proxy.conf b/trunk/conf/origin1-for-proxy.conf index baca5c9f4..8c25f7341 100644 --- a/trunk/conf/origin1-for-proxy.conf +++ b/trunk/conf/origin1-for-proxy.conf @@ -16,7 +16,7 @@ http_api { rtc_server { enabled on; listen 8001; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } srt_server { @@ -45,9 +45,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } srt { diff --git a/trunk/conf/origin2-for-proxy.conf b/trunk/conf/origin2-for-proxy.conf index 48f639893..ae8a8c940 100644 --- a/trunk/conf/origin2-for-proxy.conf +++ b/trunk/conf/origin2-for-proxy.conf @@ -16,7 +16,7 @@ http_api { rtc_server { enabled on; listen 8001; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } srt_server { @@ -45,9 +45,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } srt { diff --git a/trunk/conf/origin3-for-proxy.conf b/trunk/conf/origin3-for-proxy.conf index 95624fb77..5155afd6c 100644 --- a/trunk/conf/origin3-for-proxy.conf +++ b/trunk/conf/origin3-for-proxy.conf @@ -16,7 +16,7 @@ http_api { rtc_server { enabled on; listen 8001; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } srt_server { @@ -45,9 +45,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } srt { diff --git a/trunk/conf/prometheus.conf b/trunk/conf/prometheus.conf index 50d944754..f6bc3362c 100644 --- a/trunk/conf/prometheus.conf +++ b/trunk/conf/prometheus.conf @@ -16,7 +16,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } # Prometheus exporter config. @@ -36,9 +36,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } } diff --git a/trunk/conf/push.flv.conf b/trunk/conf/push.flv.conf index 568becc0c..e43151287 100644 --- a/trunk/conf/push.flv.conf +++ b/trunk/conf/push.flv.conf @@ -1,5 +1,5 @@ # push HTTP FLV to SRS. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/streamer#push-http-flv-to-srs +# @see https://ossrs.io/lts/en-us/docs/v7/doc/streamer#push-http-flv-to-srs # @see full.conf for detail config. listen 1935; @@ -24,15 +24,15 @@ http_api { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/push.gb28181.conf b/trunk/conf/push.gb28181.conf index 18b552856..760ccef82 100644 --- a/trunk/conf/push.gb28181.conf +++ b/trunk/conf/push.gb28181.conf @@ -10,7 +10,7 @@ stream_caster { output rtmp://127.0.0.1/live/[stream]; listen 9000; # Deprecated config, moved to sip.candidate, see gb28181.conf - # @see https://ossrs.net/lts/zh-cn/docs/v5/doc/gb28181#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/gb28181#config-candidate host $CANDIDATE; sip { enabled on; @@ -34,16 +34,16 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/push.mpegts.over.udp.conf b/trunk/conf/push.mpegts.over.udp.conf index 67cdeba37..3b2ed86a8 100644 --- a/trunk/conf/push.mpegts.over.udp.conf +++ b/trunk/conf/push.mpegts.over.udp.conf @@ -1,5 +1,5 @@ # push MPEG-TS over UDP to SRS. -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/streamer#push-mpeg-ts-over-udp +# @see https://ossrs.io/lts/en-us/docs/v7/doc/streamer#push-mpeg-ts-over-udp # @see https://github.com/ossrs/srs/issues/250#issuecomment-72321769 # @see full.conf for detail config. @@ -25,15 +25,15 @@ http_api { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/realtime.conf b/trunk/conf/realtime.conf index ddbf616bc..a59bf52e7 100644 --- a/trunk/conf/realtime.conf +++ b/trunk/conf/realtime.conf @@ -1,5 +1,5 @@ # the config for srs to delivery realtime RTMP stream -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-realtime +# @see https://ossrs.io/lts/en-us/docs/v7/doc/sample-realtime # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/realtime.flv.conf b/trunk/conf/realtime.flv.conf index 15b74f339..f33ab5172 100644 --- a/trunk/conf/realtime.flv.conf +++ b/trunk/conf/realtime.flv.conf @@ -1,5 +1,5 @@ # the config for srs to delivery realtime RTMP stream -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-realtime +# @see https://ossrs.io/lts/en-us/docs/v7/doc/sample-realtime # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/rtc.conf b/trunk/conf/rtc.conf index 76c1546da..2d44cd591 100644 --- a/trunk/conf/rtc.conf +++ b/trunk/conf/rtc.conf @@ -22,16 +22,16 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } http_remux { diff --git a/trunk/conf/rtc.tcp.only.conf b/trunk/conf/rtc.tcp.only.conf index a18474c8c..b70289e50 100644 --- a/trunk/conf/rtc.tcp.only.conf +++ b/trunk/conf/rtc.tcp.only.conf @@ -26,16 +26,16 @@ rtc_server { listen 8000; } protocol tcp; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } http_remux { diff --git a/trunk/conf/rtc.tcp.udp.conf b/trunk/conf/rtc.tcp.udp.conf index 7fcd3a808..4b5d4a5b8 100644 --- a/trunk/conf/rtc.tcp.udp.conf +++ b/trunk/conf/rtc.tcp.udp.conf @@ -27,16 +27,16 @@ rtc_server { listen 8000; } protocol all; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } http_remux { diff --git a/trunk/conf/rtc2rtmp.conf b/trunk/conf/rtc2rtmp.conf index daa50e2a7..e6649b3b2 100644 --- a/trunk/conf/rtc2rtmp.conf +++ b/trunk/conf/rtc2rtmp.conf @@ -20,16 +20,16 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/rtmp.conf b/trunk/conf/rtmp.conf index 6b068eb74..940f35c73 100644 --- a/trunk/conf/rtmp.conf +++ b/trunk/conf/rtmp.conf @@ -1,5 +1,5 @@ # the config for srs to delivery RTMP -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-rtmp +# @see https://ossrs.io/lts/en-us/docs/v7/doc/rtmp # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/rtmp2rtc.conf b/trunk/conf/rtmp2rtc.conf index daa50e2a7..e6649b3b2 100644 --- a/trunk/conf/rtmp2rtc.conf +++ b/trunk/conf/rtmp2rtc.conf @@ -20,16 +20,16 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 7ed8d9fea..abf9dcf87 100644 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -18,7 +18,7 @@ http_server { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -31,9 +31,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc off; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp off; } diff --git a/trunk/conf/srt2rtc.conf b/trunk/conf/srt2rtc.conf index 2f4ac6ba4..4116eb8bc 100644 --- a/trunk/conf/srt2rtc.conf +++ b/trunk/conf/srt2rtc.conf @@ -32,7 +32,7 @@ rtc_server { # The $CANDIDATE means fetch from env, if not configed, use * as default. # # The * means retrieving server IP automatically, from all network interfaces, - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } @@ -43,9 +43,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/srt2ts.conf b/trunk/conf/srt2ts.conf index 0f2ef1918..942c9e15f 100644 --- a/trunk/conf/srt2ts.conf +++ b/trunk/conf/srt2ts.conf @@ -32,7 +32,7 @@ rtc_server { # The $CANDIDATE means fetch from env, if not configed, use * as default. # # The * means retrieving server IP automatically, from all network interfaces, - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } @@ -43,9 +43,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/transcode2hls.audio.only.conf b/trunk/conf/transcode2hls.audio.only.conf index b4f8997d5..966c87f75 100644 --- a/trunk/conf/transcode2hls.audio.only.conf +++ b/trunk/conf/transcode2hls.audio.only.conf @@ -1,5 +1,5 @@ # the config for srs to delivery hls -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-hls +# @see https://ossrs.io/lts/en-us/docs/v7/doc/hls # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/transform.edge.conf b/trunk/conf/transform.edge.conf index fb4aff937..527735a68 100644 --- a/trunk/conf/transform.edge.conf +++ b/trunk/conf/transform.edge.conf @@ -1,5 +1,5 @@ # the config for srs origin-edge cluster -# @see https://ossrs.net/lts/zh-cn/docs/v4/doc/edge#transform-vhost +# @see https://ossrs.io/lts/en-us/docs/v7/doc/edge#transform-vhost # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/vm.conf b/trunk/conf/vm.conf index 9f6545c7a..3dcd2c1dd 100644 --- a/trunk/conf/vm.conf +++ b/trunk/conf/vm.conf @@ -25,7 +25,7 @@ stats { rtc_server { enabled on; listen 8000; # UDP port - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#config-candidate + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#config-candidate candidate $CANDIDATE; } @@ -39,9 +39,9 @@ vhost __defaultVhost__ { } rtc { enabled on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtmp-to-rtc + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtmp-to-rtc rtmp_to_rtc on; - # @see https://ossrs.net/lts/zh-cn/docs/v4/doc/webrtc#rtc-to-rtmp + # @see https://ossrs.io/lts/en-us/docs/v7/doc/webrtc#rtc-to-rtmp rtc_to_rtmp on; } } diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index bfb87445f..9bbe52a1e 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -776,11 +776,11 @@ public: // Get the transformed vhost for edge, virtual std::string get_vhost_edge_transform_vhost(std::string vhost); // Whether enable the origin cluster. - // @see https://ossrs.net/lts/zh-cn/docs/v4/doc/origin-cluster + // @see https://ossrs.io/lts/en-us/docs/v7/doc/origin-cluster#legacy virtual bool get_vhost_origin_cluster(std::string vhost); virtual bool get_vhost_origin_cluster(SrsConfDirective* conf); // Get the co-workers of origin cluster. - // @see https://ossrs.net/lts/zh-cn/docs/v4/doc/origin-cluster + // @see https://ossrs.io/lts/en-us/docs/v7/doc/origin-cluster#legacy virtual std::vector get_vhost_coworkers(std::string vhost); // vhost security section public: diff --git a/trunk/src/app/srs_app_reload.hpp b/trunk/src/app/srs_app_reload.hpp index f3161bf95..2f3ba8035 100644 --- a/trunk/src/app/srs_app_reload.hpp +++ b/trunk/src/app/srs_app_reload.hpp @@ -15,7 +15,7 @@ // When reload callback, the config is updated yet. // // Features not support reload, -// @see: https://ossrs.net/lts/zh-cn/docs/v4/doc/reload#notsupportedfeatures +// @see: https://ossrs.io/lts/en-us/docs/v7/doc/reload#notsupportedfeatures class ISrsReloadHandler { public: diff --git a/trunk/src/app/srs_app_srt_source.cpp b/trunk/src/app/srs_app_srt_source.cpp index 01dd2dc9b..d8dbece90 100644 --- a/trunk/src/app/srs_app_srt_source.cpp +++ b/trunk/src/app/srs_app_srt_source.cpp @@ -310,7 +310,7 @@ srs_error_t SrsSrtFrameBuilder::on_packet(SrsSrtPacket *pkt) SrsUniquePtr stream(new SrsBuffer(p, SRS_TS_PACKET_SIZE)); // Process each ts packet. Note that the jitter of UDP may cause video glitch when packet loss or wrong seq. We - // don't handle it because SRT will, see tlpktdrop at https://ossrs.net/lts/zh-cn/docs/v4/doc/srt-params + // don't handle it because SRT will, see tlpktdrop at https://ossrs.io/lts/en-us/docs/v7/doc/srt if ((err = ts_ctx_->decode(stream.get(), this)) != srs_success) { srs_warn("parse ts packet err=%s", srs_error_desc(err).c_str()); srs_error_reset(err); @@ -817,7 +817,7 @@ srs_error_t SrsSrtFrameBuilder::on_ts_audio(SrsTsMessage* msg, SrsBuffer* avs) // MPEG-TS always merge multi audio frame into one pes packet, may cause high latency and AV synchronization errors // @see https://github.com/ossrs/srs/issues/3164 srs_warn("srt to rtmp, audio duration=%dms too large, audio frames=%d, may cause high latency and AV synchronization errors, " - "read https://ossrs.io/lts/en-us/docs/v5/doc/srt-codec#ffmpeg-push-srt-stream", duration_ms, frame_idx); + "read https://ossrs.io/lts/en-us/docs/v7/doc/srt#ffmpeg-push-srt-stream", duration_ms, frame_idx); } return err;