mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge
This commit is contained in:
commit
f41e79e010
65 changed files with 276 additions and 5990 deletions
|
@ -1,4 +1,4 @@
|
|||
# main config for srs.
|
||||
# docker config for srs.
|
||||
# @see full.conf for detail config.
|
||||
|
||||
listen 1935;
|
||||
|
@ -14,20 +14,10 @@ http_server {
|
|||
listen 8080;
|
||||
dir ./objs/nginx/html;
|
||||
}
|
||||
stats {
|
||||
network 0;
|
||||
disk sda sdb xvda xvdb;
|
||||
}
|
||||
rtc_server {
|
||||
enabled on;
|
||||
# Listen at udp://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/issues/307#issuecomment-599028124
|
||||
candidate $CANDIDATE;
|
||||
enabled on;
|
||||
listen 8000;
|
||||
candidate $CANDIDATE;
|
||||
}
|
||||
vhost __defaultVhost__ {
|
||||
hls {
|
||||
|
@ -39,6 +29,5 @@ vhost __defaultVhost__ {
|
|||
}
|
||||
rtc {
|
||||
enabled on;
|
||||
bframe discard;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -230,11 +230,11 @@ http_api {
|
|||
# default: off
|
||||
allow_reload off;
|
||||
# whether enable rpc query.
|
||||
# default: off
|
||||
allow_query off;
|
||||
# Always off by https://github.com/ossrs/srs/issues/2653
|
||||
#allow_query off;
|
||||
# whether enable rpc update.
|
||||
# default: off
|
||||
allow_update off;
|
||||
# Always off by https://github.com/ossrs/srs/issues/2653
|
||||
#allow_update off;
|
||||
}
|
||||
# For https_api or HTTPS API.
|
||||
https {
|
||||
|
@ -323,33 +323,6 @@ stream_caster {
|
|||
listen 8935;
|
||||
}
|
||||
|
||||
# RTSP
|
||||
# It's deprecated and will be removed in the future, see [#2304](https://github.com/ossrs/srs/issues/2304#issuecomment-826009290).
|
||||
stream_caster {
|
||||
# whether stream caster is enabled.
|
||||
# default: off
|
||||
enabled on;
|
||||
# the caster type of stream, the casters:
|
||||
# rtsp, Real Time Streaming Protocol (RTSP).
|
||||
caster rtsp;
|
||||
# the output rtmp url.
|
||||
# for rtsp caster, the typically output url:
|
||||
# rtmp://127.0.0.1/[app]/[stream]
|
||||
# for example, the rtsp url:
|
||||
# rtsp://192.168.1.173:8544/live/livestream.sdp
|
||||
# where the [app] is "live" and [stream] is "livestream", output is:
|
||||
# rtmp://127.0.0.1/live/livestream
|
||||
output rtmp://127.0.0.1/[app]/[stream];
|
||||
# the listen port for stream caster.
|
||||
# for rtsp caster, listen at tcp port. for example, 554.
|
||||
listen 554;
|
||||
# for the rtsp caster, the rtp server local port over udp,
|
||||
# which reply the rtsp setup request message, the port will be used:
|
||||
# [rtp_port_min, rtp_port_max)
|
||||
rtp_port_min 57200;
|
||||
rtp_port_max 57300;
|
||||
}
|
||||
|
||||
# FLV
|
||||
stream_caster {
|
||||
# whether stream caster is enabled.
|
||||
|
|
|
@ -11,8 +11,6 @@ http_api {
|
|||
raw_api {
|
||||
enabled on;
|
||||
allow_reload on;
|
||||
allow_query on;
|
||||
allow_update on;
|
||||
}
|
||||
}
|
||||
http_server {
|
||||
|
|
|
@ -1,19 +1,2 @@
|
|||
# push MPEG-TS over UDP to SRS.
|
||||
# @see https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-mpeg-ts-over-udp
|
||||
# @see https://github.com/ossrs/srs/issues/250#issuecomment-72321769
|
||||
# @see full.conf for detail config.
|
||||
|
||||
listen 1935;
|
||||
max_connections 1000;
|
||||
daemon off;
|
||||
srs_log_tank console;
|
||||
stream_caster {
|
||||
enabled on;
|
||||
caster rtsp;
|
||||
output rtmp://127.0.0.1/[app]/[stream];
|
||||
listen 554;
|
||||
rtp_port_min 57200;
|
||||
rtp_port_max 57300;
|
||||
}
|
||||
vhost __defaultVhost__ {
|
||||
}
|
||||
# @note Removed for https://github.com/ossrs/srs/issues/2304#issuecomment-826009290
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
listen 1935;
|
||||
max_connections 1000;
|
||||
srs_log_tank file;
|
||||
srs_log_file ./objs/srs.log;
|
||||
#srs_log_tank file;
|
||||
#srs_log_file ./objs/srs.log;
|
||||
daemon on;
|
||||
http_api {
|
||||
enabled on;
|
||||
|
@ -15,6 +15,11 @@ http_server {
|
|||
listen 8080;
|
||||
dir ./objs/nginx/html;
|
||||
}
|
||||
rtc_server {
|
||||
enabled on;
|
||||
listen 8000;
|
||||
candidate $CANDIDATE;
|
||||
}
|
||||
vhost __defaultVhost__ {
|
||||
hls {
|
||||
enabled on;
|
||||
|
@ -23,4 +28,7 @@ vhost __defaultVhost__ {
|
|||
enabled on;
|
||||
mount [vhost]/[app]/[stream].flv;
|
||||
}
|
||||
rtc {
|
||||
enabled on;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue