ynerant/ghostream
1
0
Fork 0
mirror of https://gitlab.crans.org/nounous/ghostream.git synced 2024-12-22 10:22:19 +00:00
Code Issues Releases Wiki Activity

Add DASH player source for more compatibility

Browse Source
This commit is contained in:
Yohann D'ANELLO 2020-11-20 03:26:10 +01:00
parent 205c4b526c
commit 849196b4cb
3 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
docs/Server-docker.xml
View File

@ -21,8 +21,11 @@
</IceCandidates> </IceCandidates>
</WebRTC> </WebRTC>
<HLS> <HLS>
<Port>80</Port> <Port>80</Port>
</HLS> </HLS>
<DASH>
<Port>80</Port>
</DASH>
</Publishers> </Publishers>
</Bind> </Bind>
@ -52,14 +55,15 @@
</Video> </Video>
</Encode> </Encode>
<Encode> <Encode>
<Name>BYPASS</Name> <Name>bypass</Name>
<Video>
<Bypass>true</Bypass>
</Video>
<Audio> <Audio>
<Bypass>true</Bypass> <Bypass>true</Bypass>
</Audio> </Audio>
<Video>
<Bypass>true</Bypass>
</Video>
</Encode> </Encode>
</Encodes> </Encodes>
<Streams> <Streams>
<Stream> <Stream>
@ -71,9 +75,10 @@
<Stream> <Stream>
<Name>${OriginStreamName}_bypass</Name> <Name>${OriginStreamName}_bypass</Name>
<Profiles> <Profiles>
<Profile>BYPASS</Profile> <Profile>bypass</Profile>
</Profiles> </Profiles>
</Stream> </Stream>
</Streams> </Streams>
<Providers> <Providers>
<RTMP> <RTMP>
@ -86,15 +91,28 @@
<Timeout>30000</Timeout> <Timeout>30000</Timeout>
</WebRTC> </WebRTC>
<HLS> <HLS>
<SegmentDuration>5</SegmentDuration> <SegmentDuration>2</SegmentDuration>
<SegmentCount>2</SegmentCount> <SegmentCount>2</SegmentCount>
<CrossDomain> <CrossDomain>
<Url>*</Url> <Url>*</Url>
</CrossDomain> </CrossDomain>
</HLS> </HLS>
<DASH>
<SegmentDuration>2</SegmentDuration>
<SegmentCount>2</SegmentCount>
<CrossDomain>
<Url>*</Url>
</CrossDomain>
</DASH>
<LLDASH>
<SegmentDuration>2</SegmentDuration>
<CrossDomain>
<Url>*</Url>
</CrossDomain>
</LLDASH>
</Publishers> </Publishers>
</Application> </Application>
</Applications> </Applications>
</VirtualHost> </VirtualHost>
</VirtualHosts> </VirtualHosts>
</Server> </Server>

14
web/static/js/ovenplayer.js
View File

@ -47,10 +47,20 @@ export function initViewerPage(stream, omeApp, viewersCounterRefreshPeriod, post
"label": " WebRTC - Source" "label": " WebRTC - Source"
}, },
{ {
"type": "hls",
"file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/playlist.m3u8", "file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/playlist.m3u8",
"type": "hls",
"label": " 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) { player.on("stateChanged", function (data) {

1
web/template/player.html
View File

@ -36,6 +36,7 @@
{{if .OMECfg.Enabled}} {{if .OMECfg.Enabled}}
<script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script> <script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/dashjs/2.9.3/dash.all.min.js"></script>
<script src="/static/ovenplayer/ovenplayer.js"></script> <script src="/static/ovenplayer/ovenplayer.js"></script>
<script src="/static/js/ovenplayer.js"></script> <script src="/static/js/ovenplayer.js"></script>
{{end}} {{end}}