ynerant/ghostream
1
0
Fork 0
mirror of https://gitlab.crans.org/nounous/ghostream.git synced 2025-07-01 10:11:13 +02:00
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:ovenmediaengine
Branches Tags
ynerant:dev ynerant:ovenmediaengine ynerant:h264-reader ynerant:multi-quality ynerant:webrtc-messaging ynerant:poc
..
compare: ynerant:849196b4cb1b7cea9347bc62bd9ea8baa2217b56
Branches Tags
ynerant:dev ynerant:ovenmediaengine ynerant:h264-reader ynerant:multi-quality ynerant:webrtc-messaging ynerant:poc

4 Commits
ovenmediae ... 849196b4cb

Author SHA1 Message Date
Yohann D'ANELLO
849196b4cb Add DASH player source for more compatibility 2020-11-20 03:26:10 +01:00
Yohann D'ANELLO
205c4b526c Upgrade ovenplayer, add HTML5 provider 2020-11-20 02:46:25 +01:00
Yohann D'ANELLO
1d117ea480 Config on legal mentions 2020-11-12 01:42:28 +01:00
ynerant
45cb61e436 Merge branch 'ovenmediaengine' into 'dev' 
OvenMediaEngine

See merge request nounous/ghostream!8
 2020-11-09 21:53:44 +01:00
12 changed files with 51 additions and 15 deletions
Expand all files Collapse all files

34
docs/Server-docker.xml
View File

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

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

File diff suppressed because one or more lines are too long

2
web/static/ovenplayer/ovenplayer.provider.DashProvider-0.9.0.js
View File

File diff suppressed because one or more lines are too long

2
web/static/ovenplayer/ovenplayer.provider.DashProvider~ovenplayer.provider.HlsProvider~ovenplayer.provider.Html5~ovenplaye~2ec193ac-0.9.0.js
View File

File diff suppressed because one or more lines are too long

2
web/static/ovenplayer/ovenplayer.provider.HlsProvider-0.9.0.js
View File

File diff suppressed because one or more lines are too long

2
web/static/ovenplayer/ovenplayer.provider.Html5-0.9.0.js Normal file
View File

File diff suppressed because one or more lines are too long

1
web/static/ovenplayer/ovenplayer.provider.Html5-0.9.0.js.LICENSE Normal file
View File

@ -0,0 +1 @@
/*! OvenPlayerv0.9.0 | (c)2020 AirenSoft Co., Ltd. | MIT license (https://github.com/AirenSoft/OvenPlayerPrivate/blob/master/LICENSE) | Github : https://github.com/AirenSoft/OvenPlayer */

3
web/static/ovenplayer/ovenplayer.provider.WebRTCProvider-0.9.0.js
View File

File diff suppressed because one or more lines are too long

2
web/static/ovenplayer/ovenplayer.sdk.js Normal file
View File

File diff suppressed because one or more lines are too long

1
web/static/ovenplayer/ovenplayer.sdk.js.LICENSE Normal file
View File

@ -0,0 +1 @@
/*! OvenPlayerv0.9.0 | (c)2020 AirenSoft Co., Ltd. | MIT license (https://github.com/AirenSoft/OvenPlayerPrivate/blob/master/LICENSE) | Github : https://github.com/AirenSoft/OvenPlayer */

1
web/template/player.html
View File

@ -36,6 +36,7 @@
{{if .OMECfg.Enabled}}
<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/js/ovenplayer.js"></script>
{{end}}