From fe9e43b6d44c61c480dde4ea1197f7b8524cfb55 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 11 Oct 2021 16:36:05 +0800 Subject: [PATCH] RTC: Refine config for RTC --- trunk/conf/clion-ingest.conf | 2 +- trunk/conf/clion.conf | 6 +++++- trunk/conf/docker.conf | 3 +++ trunk/conf/full.conf | 2 +- trunk/conf/rtc.conf | 3 +++ trunk/conf/rtc2rtmp.conf | 3 +++ trunk/conf/rtmp2rtc.conf | 3 +++ trunk/conf/srs.conf | 3 +++ trunk/conf/srt2rtc.conf | 6 +++++- 9 files changed, 27 insertions(+), 4 deletions(-) diff --git a/trunk/conf/clion-ingest.conf b/trunk/conf/clion-ingest.conf index 76fab5f41..c991a47f1 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://github.com/ossrs/srs/wiki/v4_CN_RTCWiki#config-candidate + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } diff --git a/trunk/conf/clion.conf b/trunk/conf/clion.conf index 0a3360c9f..cceabe17e 100644 --- a/trunk/conf/clion.conf +++ b/trunk/conf/clion.conf @@ -25,13 +25,17 @@ 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://github.com/ossrs/srs/wiki/v4_CN_RTCWiki#config-candidate + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc + aac transcode; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp + rtc_to_rtmp on; } http_remux { enabled on; diff --git a/trunk/conf/docker.conf b/trunk/conf/docker.conf index 49b885487..61175100e 100644 --- a/trunk/conf/docker.conf +++ b/trunk/conf/docker.conf @@ -17,6 +17,7 @@ http_server { rtc_server { enabled on; listen 8000; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -29,7 +30,9 @@ vhost __defaultVhost__ { } rtc { enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc aac discard; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index b31994153..234b3edfc 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -388,7 +388,7 @@ rtc_server { # And by multiple ENV variables: # $CANDIDATE $EIP # TODO: Implements it. # @remark For Firefox, the candidate MUST be IP, MUST NOT be DNS name. - # @see https://github.com/ossrs/srs/wiki/v4_CN_RTCWiki#config-candidate + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate # default: * candidate *; # The IP family filter for auto discover candidate, it can be: diff --git a/trunk/conf/rtc.conf b/trunk/conf/rtc.conf index 71a2573b8..adcfc2b57 100644 --- a/trunk/conf/rtc.conf +++ b/trunk/conf/rtc.conf @@ -22,13 +22,16 @@ stats { rtc_server { enabled on; listen 8000; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc aac discard; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp rtc_to_rtmp off; } http_remux { diff --git a/trunk/conf/rtc2rtmp.conf b/trunk/conf/rtc2rtmp.conf index 0f5ef741b..08707b5ab 100644 --- a/trunk/conf/rtc2rtmp.conf +++ b/trunk/conf/rtc2rtmp.conf @@ -20,13 +20,16 @@ stats { rtc_server { enabled on; listen 8000; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc aac transcode; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/rtmp2rtc.conf b/trunk/conf/rtmp2rtc.conf index 0f5ef741b..08707b5ab 100644 --- a/trunk/conf/rtmp2rtc.conf +++ b/trunk/conf/rtmp2rtc.conf @@ -20,13 +20,16 @@ stats { rtc_server { enabled on; listen 8000; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { rtc { enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc aac transcode; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp rtc_to_rtmp on; } http_remux { diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index ddee85a28..8dba3c6cf 100644 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -18,6 +18,7 @@ http_server { rtc_server { enabled on; listen 8000; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } vhost __defaultVhost__ { @@ -30,7 +31,9 @@ vhost __defaultVhost__ { } rtc { enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc aac discard; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp rtc_to_rtmp off; } } diff --git a/trunk/conf/srt2rtc.conf b/trunk/conf/srt2rtc.conf index ff8352ef2..31d2243e3 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://github.com/ossrs/srs/wiki/v4_CN_RTCWiki#config-candidate + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate candidate $CANDIDATE; } @@ -40,6 +40,10 @@ rtc_server { vhost __defaultVhost__ { rtc { enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc + aac discard; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp + rtc_to_rtmp off; } http_remux { enabled on;