ynerant/ghostream
1
0
Fork 0
mirror of https://gitlab.crans.org/nounous/ghostream.git synced 2025-02-12 15:41:16 +00:00
Code Issues Releases Wiki Activity

Compare commits

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

No commits in common. "849196b4cb1b7cea9347bc62bd9ea8baa2217b56" and "1d117ea4809894492dcdf3b2215a1af38145e997" have entirely different histories.
849196b4cb ... 1d117ea480

12 changed files with 15 additions and 51 deletions
Show Stats Expand all files Collapse all files

30
docs/Server-docker.xml
View File

@ -23,9 +23,6 @@
<HLS>
<Port>80</Port>
</HLS>
<DASH>
<Port>80</Port>
</DASH>
</Publishers>
</Bind>
@ -55,15 +52,14 @@
</Video>
</Encode>
<Encode>
<Name>bypass</Name>
<Audio>
<Bypass>true</Bypass>
</Audio>
<Name>BYPASS</Name>
<Video>
<Bypass>true</Bypass>
</Video>
<Audio>
<Bypass>true</Bypass>
</Audio>
</Encode>
</Encodes>
<Streams>
<Stream>
@ -75,10 +71,9 @@
<Stream>
<Name>${OriginStreamName}_bypass</Name>
<Profiles>
<Profile>bypass</Profile>
<Profile>BYPASS</Profile>
</Profiles>
</Stream>
</Streams>
<Providers>
<RTMP>
@ -91,25 +86,12 @@
<Timeout>30000</Timeout>
</WebRTC>
<HLS>
<SegmentDuration>2</SegmentDuration>
<SegmentDuration>5</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>

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

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

@ -1 +0,0 @@
/*! 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
View File

File diff suppressed because one or more lines are too long

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

@ -1 +0,0 @@
/*! 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,7 +36,6 @@
{{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}}