diff --git a/conf/full.conf b/conf/full.conf index 4edac7d..38cfa40 100644 --- a/conf/full.conf +++ b/conf/full.conf @@ -62,6 +62,12 @@ work_dir ./; # @reamrk do not support reload. # default: off asprocess off; +# whether use build-in speex to aac transcoding +# default: off +speex2aac off; +# set cpu affinity,the index of the cpu core,0,1,2,... +# default -1,don't set affinity +cpu_affinity -1; ############################################################################################# # heartbeat/stats sections @@ -928,6 +934,16 @@ vhost same.vhost.forward.srs.com { # active-active for cdn to build high available fault tolerance system. # format: {ip}:{port} {ip_N}:{port_N} forward 127.0.0.1:1936 127.0.0.1:1937; + # forward_in_turn all publish stream to the specified server in turn. + # this used to split/forward the current stream for transcode and make load balance + # active-active for cdn to build high available fault tolerance system. + # format: {ip}:{port} {ip_N}:{port_N} + forward_in_turn 127.0.0.1:19351 127.0.0.1:19352; + #if the forward server is same as this server , a origin,try use forward_peer, + #the stream pushed from other forward peer will not forward any more in this server + forward_peer 127.0.0.1:1936; + #list out the servers which is not srs ,used in forward or forward_in_turn,and forward_peer for example,forward to some CDN + forward_server_other 127.0.0.1:19351; } # the main comments for transcode diff --git a/objs/srs b/objs/srs index 2179815..fce9482 100755 Binary files a/objs/srs and b/objs/srs differ