winlin

regression test ok

@@ -81,12 +81,11 @@ vhost __defaultVhost__ { @@ -81,12 +81,11 @@ vhost __defaultVhost__ {
81 vhost dev { 81 vhost dev {
82 enabled on; 82 enabled on;
83 gop_cache on; 83 gop_cache on;
84 - hls off; 84 + hls on;
85 hls_path ./objs/nginx/html; 85 hls_path ./objs/nginx/html;
86 hls_fragment 5; 86 hls_fragment 5;
87 hls_window 30; 87 hls_window 30;
88 - #forward 127.0.0.1:19350;  
89 - #forward 127.0.0.1:1936; 88 + forward 127.0.0.1:19350;
90 http_hooks { 89 http_hooks {
91 enabled on; 90 enabled on;
92 on_connect http://127.0.0.1:8085/api/v1/clients; 91 on_connect http://127.0.0.1:8085/api/v1/clients;
@@ -97,10 +96,10 @@ vhost dev { @@ -97,10 +96,10 @@ vhost dev {
97 on_stop http://127.0.0.1:8085/api/v1/sessions; 96 on_stop http://127.0.0.1:8085/api/v1/sessions;
98 } 97 }
99 transcode { 98 transcode {
100 - enabled off; 99 + enabled on;
101 ffmpeg ./objs/ffmpeg/bin/ffmpeg; 100 ffmpeg ./objs/ffmpeg/bin/ffmpeg;
102 engine dev { 101 engine dev {
103 - enabled off; 102 + enabled on;
104 vfilter { 103 vfilter {
105 } 104 }
106 vcodec libx264; 105 vcodec libx264;