mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
RTC: Change rtc.aac to discard by default. v4.0.172
This commit is contained in:
parent
2fa5a0bee8
commit
0f9b9505a8
9 changed files with 49 additions and 16 deletions
|
@ -29,5 +29,7 @@ vhost __defaultVhost__ {
|
||||||
}
|
}
|
||||||
rtc {
|
rtc {
|
||||||
enabled on;
|
enabled on;
|
||||||
|
aac discard;
|
||||||
|
rtc_to_rtmp off;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -467,8 +467,8 @@ vhost rtc.vhost.srs.com {
|
||||||
# For transmuxing RTMP to RTC, the strategy for aac audio.
|
# For transmuxing RTMP to RTC, the strategy for aac audio.
|
||||||
# transcode Transcode aac to opus.
|
# transcode Transcode aac to opus.
|
||||||
# discard Discard aac audio packet.
|
# discard Discard aac audio packet.
|
||||||
# default: transcode
|
# default: discard
|
||||||
aac transcode;
|
aac discard;
|
||||||
###############################################################
|
###############################################################
|
||||||
# For transmuxing RTC to RTMP.
|
# For transmuxing RTC to RTMP.
|
||||||
# Whether trans-mux RTC to RTMP streaming.
|
# Whether trans-mux RTC to RTMP streaming.
|
||||||
|
|
|
@ -21,19 +21,15 @@ stats {
|
||||||
}
|
}
|
||||||
rtc_server {
|
rtc_server {
|
||||||
enabled on;
|
enabled on;
|
||||||
# Listen at udp://8000
|
|
||||||
listen 8000;
|
listen 8000;
|
||||||
#
|
|
||||||
# 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
|
|
||||||
candidate $CANDIDATE;
|
candidate $CANDIDATE;
|
||||||
}
|
}
|
||||||
|
|
||||||
vhost __defaultVhost__ {
|
vhost __defaultVhost__ {
|
||||||
rtc {
|
rtc {
|
||||||
enabled on;
|
enabled on;
|
||||||
|
aac discard;
|
||||||
|
rtc_to_rtmp off;
|
||||||
}
|
}
|
||||||
http_remux {
|
http_remux {
|
||||||
enabled on;
|
enabled on;
|
||||||
|
|
|
@ -19,19 +19,14 @@ stats {
|
||||||
}
|
}
|
||||||
rtc_server {
|
rtc_server {
|
||||||
enabled on;
|
enabled on;
|
||||||
# Listen at udp://8000
|
|
||||||
listen 8000;
|
listen 8000;
|
||||||
#
|
|
||||||
# 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
|
|
||||||
candidate $CANDIDATE;
|
candidate $CANDIDATE;
|
||||||
}
|
}
|
||||||
|
|
||||||
vhost __defaultVhost__ {
|
vhost __defaultVhost__ {
|
||||||
rtc {
|
rtc {
|
||||||
enabled on;
|
enabled on;
|
||||||
|
aac transcode;
|
||||||
rtc_to_rtmp on;
|
rtc_to_rtmp on;
|
||||||
}
|
}
|
||||||
http_remux {
|
http_remux {
|
||||||
|
|
37
trunk/conf/rtmp2rtc.conf
Normal file
37
trunk/conf/rtmp2rtc.conf
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
|
||||||
|
listen 1935;
|
||||||
|
max_connections 1000;
|
||||||
|
daemon off;
|
||||||
|
srs_log_tank console;
|
||||||
|
|
||||||
|
http_server {
|
||||||
|
enabled on;
|
||||||
|
listen 8080;
|
||||||
|
dir ./objs/nginx/html;
|
||||||
|
}
|
||||||
|
|
||||||
|
http_api {
|
||||||
|
enabled on;
|
||||||
|
listen 1985;
|
||||||
|
}
|
||||||
|
stats {
|
||||||
|
network 0;
|
||||||
|
}
|
||||||
|
rtc_server {
|
||||||
|
enabled on;
|
||||||
|
listen 8000;
|
||||||
|
candidate $CANDIDATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
vhost __defaultVhost__ {
|
||||||
|
rtc {
|
||||||
|
enabled on;
|
||||||
|
aac transcode;
|
||||||
|
rtc_to_rtmp on;
|
||||||
|
}
|
||||||
|
http_remux {
|
||||||
|
enabled on;
|
||||||
|
mount [vhost]/[app]/[stream].flv;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -30,5 +30,7 @@ vhost __defaultVhost__ {
|
||||||
}
|
}
|
||||||
rtc {
|
rtc {
|
||||||
enabled on;
|
enabled on;
|
||||||
|
aac discard;
|
||||||
|
rtc_to_rtmp off;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ The changelog for SRS.
|
||||||
|
|
||||||
## SRS 4.0 Changelog
|
## SRS 4.0 Changelog
|
||||||
|
|
||||||
|
* v4.0, 2021-10-10, RTC: Change rtc.aac to discard by default. v4.0.172
|
||||||
* v4.0, 2021-10-10, Fix [#2304](https://github.com/ossrs/srs/issues/2304) Remove Push RTSP feature. v4.0.171
|
* v4.0, 2021-10-10, Fix [#2304](https://github.com/ossrs/srs/issues/2304) Remove Push RTSP feature. v4.0.171
|
||||||
* v4.0, 2021-10-10, Fix [#2653](https://github.com/ossrs/srs/issues/2653) Remove HTTP RAW API. v4.0.170
|
* v4.0, 2021-10-10, Fix [#2653](https://github.com/ossrs/srs/issues/2653) Remove HTTP RAW API. v4.0.170
|
||||||
* v4.0, 2021-10-08, Merge [#2654](https://github.com/ossrs/srs/pull/2654): Parse width and width from SPS/PPS. v4.0.169
|
* v4.0, 2021-10-08, Merge [#2654](https://github.com/ossrs/srs/pull/2654): Parse width and width from SPS/PPS. v4.0.169
|
||||||
|
|
|
@ -3661,7 +3661,7 @@ bool SrsConfig::get_rtc_bframe_discard(string vhost)
|
||||||
|
|
||||||
bool SrsConfig::get_rtc_aac_discard(string vhost)
|
bool SrsConfig::get_rtc_aac_discard(string vhost)
|
||||||
{
|
{
|
||||||
static bool DEFAULT = false;
|
static bool DEFAULT = true;
|
||||||
|
|
||||||
SrsConfDirective* conf = get_rtc(vhost);
|
SrsConfDirective* conf = get_rtc(vhost);
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,6 @@
|
||||||
|
|
||||||
#define VERSION_MAJOR 4
|
#define VERSION_MAJOR 4
|
||||||
#define VERSION_MINOR 0
|
#define VERSION_MINOR 0
|
||||||
#define VERSION_REVISION 171
|
#define VERSION_REVISION 172
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue