diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 2694e698d..25ac12e61 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -22,15 +22,15 @@ vhost __defaultVhost__ { enabled on; gop_cache on; queue_length 30; - #forward 127.0.0.1:19350; + forward 127.0.0.1:19350; hls { - enabled off; + enabled on; hls_path ./objs/nginx/html; hls_fragment 5; hls_window 30; } http_hooks { - enabled off; + enabled on; on_connect http://127.0.0.1:8085/api/v1/clients; on_close http://127.0.0.1:8085/api/v1/clients; on_publish http://127.0.0.1:8085/api/v1/streams; @@ -39,7 +39,7 @@ vhost __defaultVhost__ { on_stop http://127.0.0.1:8085/api/v1/sessions; } transcode { - enabled off; + enabled on; ffmpeg ./objs/ffmpeg/bin/ffmpeg; engine ld { enabled on; @@ -94,9 +94,9 @@ vhost dev { enabled on; gop_cache on; queue_length 10; - forward 127.0.0.1:19350; + #forward 127.0.0.1:19350; hls { - enabled on; + enabled off; hls_path ./objs/nginx/html; hls_fragment 5; hls_window 30; diff --git a/trunk/research/players/jwplayer6.html b/trunk/research/players/jwplayer6.html index f130dda4d..b87c11c0f 100755 --- a/trunk/research/players/jwplayer6.html +++ b/trunk/research/players/jwplayer6.html @@ -16,7 +16,12 @@
@@ -38,10 +153,30 @@