胡斌

ver: 2.0+ r3538 9354d4a9 2017-06-08 09:13:30

support build-in speex to aac transcoding,add root config: speex2aac
    support set cup affinity,add root config:cpu_affinity
@@ -62,6 +62,12 @@ work_dir ./; @@ -62,6 +62,12 @@ work_dir ./;
62 # @reamrk do not support reload. 62 # @reamrk do not support reload.
63 # default: off 63 # default: off
64 asprocess off; 64 asprocess off;
  65 +# whether use build-in speex to aac transcoding
  66 +# default: off
  67 +speex2aac off;
  68 +# set cpu affinity,the index of the cpu core,0,1,2,...
  69 +# default -1,don't set affinity
  70 +cpu_affinity -1;
65 71
66 ############################################################################################# 72 #############################################################################################
67 # heartbeat/stats sections 73 # heartbeat/stats sections
@@ -928,6 +934,16 @@ vhost same.vhost.forward.srs.com { @@ -928,6 +934,16 @@ vhost same.vhost.forward.srs.com {
928 # active-active for cdn to build high available fault tolerance system. 934 # active-active for cdn to build high available fault tolerance system.
929 # format: {ip}:{port} {ip_N}:{port_N} 935 # format: {ip}:{port} {ip_N}:{port_N}
930 forward 127.0.0.1:1936 127.0.0.1:1937; 936 forward 127.0.0.1:1936 127.0.0.1:1937;
  937 + # forward_in_turn all publish stream to the specified server in turn.
  938 + # this used to split/forward the current stream for transcode and make load balance
  939 + # active-active for cdn to build high available fault tolerance system.
  940 + # format: {ip}:{port} {ip_N}:{port_N}
  941 + forward_in_turn 127.0.0.1:19351 127.0.0.1:19352;
  942 + #if the forward server is same as this server , a origin,try use forward_peer,
  943 + #the stream pushed from other forward peer will not forward any more in this server
  944 + forward_peer 127.0.0.1:1936;
  945 + #list out the servers which is not srs ,used in forward or forward_in_turn,and forward_peer for example,forward to some CDN
  946 + forward_server_other 127.0.0.1:19351;
931 } 947 }
932 948
933 # the main comments for transcode 949 # the main comments for transcode
This file is too large to display.