From 849196b4cb1b7cea9347bc62bd9ea8baa2217b56 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 20 Nov 2020 03:26:10 +0100 Subject: [PATCH] Add DASH player source for more compatibility --- docs/Server-docker.xml | 34 ++++++++++++++++++++++++++-------- web/static/js/ovenplayer.js | 14 ++++++++++++-- web/template/player.html | 1 + 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/docs/Server-docker.xml b/docs/Server-docker.xml index 5d8fb15..ba09a15 100644 --- a/docs/Server-docker.xml +++ b/docs/Server-docker.xml @@ -21,8 +21,11 @@ - 80 + 80 + + 80 + @@ -52,14 +55,15 @@ - BYPASS - + bypass + + @@ -71,9 +75,10 @@ ${OriginStreamName}_bypass - BYPASS + bypass + @@ -86,15 +91,28 @@ 30000 - 5 + 2 2 * + + 2 + 2 + + * + + + + 2 + + * + + - \ No newline at end of file + diff --git a/web/static/js/ovenplayer.js b/web/static/js/ovenplayer.js index 0a8da4e..d06ab8d 100644 --- a/web/static/js/ovenplayer.js +++ b/web/static/js/ovenplayer.js @@ -47,10 +47,20 @@ export function initViewerPage(stream, omeApp, viewersCounterRefreshPeriod, post "label": " WebRTC - Source" }, { - "type": "hls", "file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/playlist.m3u8", + "type": "hls", "label": " HLS" - } + }, + { + "file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/manifest.mpd", + "type": "dash", + "label": "DASH" + }, + { + "file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/manifest_ll.mpd", + "type": "dash", + "label": "LL-DASH" + }, ] }); player.on("stateChanged", function (data) { diff --git a/web/template/player.html b/web/template/player.html index f280d43..c0554a2 100644 --- a/web/template/player.html +++ b/web/template/player.html @@ -36,6 +36,7 @@ {{if .OMECfg.Enabled}} + {{end}}