胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
7ae76b57 1 parent 77d21f7e

refine the conf, use srs3 style

内嵌 并排对比
正在显示 6 个修改的文件 包含 13 行增加 和 3 行删除
@@ -11,7 +11,9 @@ pid ./objs/srs.demo.19350.pid; @@ -11,7 +11,9 @@ pid ./objs/srs.demo.19350.pid;
11 11
12 vhost __defaultVhost__ { 12 vhost __defaultVhost__ {
13 enabled on; 13 enabled on;
  14 + play {
14 gop_cache on; 15 gop_cache on;
  16 + }
15 hls { 17 hls {
16 enabled on; 18 enabled on;
17 hls_path ./objs/nginx/html/forward; 19 hls_path ./objs/nginx/html/forward;
@@ -445,17 +445,19 @@ vhost play.srs.com { @@ -445,17 +445,19 @@ vhost play.srs.com {
445 # vhost for time jitter 445 # vhost for time jitter
446 vhost jitter.srs.com { 446 vhost jitter.srs.com {
447 # @see play.srs.com 447 # @see play.srs.com
  448 + play {
448 time_jitter full; 449 time_jitter full;
449 - # @see play.srs.com  
450 mix_correct off; 450 mix_correct off;
  451 + }
451 } 452 }
452 453
453 # vhost for atc. 454 # vhost for atc.
454 vhost atc.srs.com { 455 vhost atc.srs.com {
455 # @see play.srs.com 456 # @see play.srs.com
  457 + play {
456 atc on; 458 atc on;
457 - # @see play.srs.com  
458 atc_auto on; 459 atc_auto on;
  460 + }
459 } 461 }
460 462
461 # the MR(merged-read) setting for publisher. 463 # the MR(merged-read) setting for publisher.
@@ -12,8 +12,10 @@ http_server { @@ -12,8 +12,10 @@ http_server {
12 dir ./objs/nginx/html; 12 dir ./objs/nginx/html;
13 } 13 }
14 vhost __defaultVhost__ { 14 vhost __defaultVhost__ {
  15 + cluster {
15 mode remote; 16 mode remote;
16 origin 127.0.0.1; 17 origin 127.0.0.1;
  18 + }
17 http_remux { 19 http_remux {
18 enabled on; 20 enabled on;
19 mount [vhost]/[app]/[stream].flv; 21 mount [vhost]/[app]/[stream].flv;
@@ -12,8 +12,10 @@ http_server { @@ -12,8 +12,10 @@ http_server {
12 dir ./objs/nginx/html; 12 dir ./objs/nginx/html;
13 } 13 }
14 vhost __defaultVhost__ { 14 vhost __defaultVhost__ {
  15 + cluster {
15 mode remote; 16 mode remote;
16 origin 127.0.0.1; 17 origin 127.0.0.1;
  18 + }
17 http_remux { 19 http_remux {
18 enabled on; 20 enabled on;
19 mount [vhost]/[app]/[stream].flv; 21 mount [vhost]/[app]/[stream].flv;
@@ -9,7 +9,7 @@ http_server { @@ -9,7 +9,7 @@ http_server {
9 dir ./objs/nginx/html; 9 dir ./objs/nginx/html;
10 } 10 }
11 vhost ossrs.net { 11 vhost ossrs.net {
12 - http { 12 + http_static {
13 enabled on; 13 enabled on;
14 mount [vhost]/; 14 mount [vhost]/;
15 dir ./objs/nginx/html; 15 dir ./objs/nginx/html;
@@ -21,7 +21,9 @@ vhost source.srs.com { @@ -21,7 +21,9 @@ vhost source.srs.com {
21 } 21 }
22 } 22 }
23 vhost transform.srs.edge.com { 23 vhost transform.srs.edge.com {
  24 + cluster {
24 mode remote; 25 mode remote;
25 origin 127.0.0.1:1935; 26 origin 127.0.0.1:1935;
26 vhost source.srs.com; 27 vhost source.srs.com;
  28 + }
27 } 29 }