mirror of
https://git.waldn.net/git/knotteye/satyr.git
synced 2026-11-20 21:19:05 +00:00
Switch from transcode server in node-media-server to spawning ffmpeg processes
Change config to reflect that ffmpeg processes cleanup after themselves even on SIGINT now, cleanup.ts only cleans the database now Adaptive livestreaming!
This commit is contained in:
1 parent
f8b197502a
commit
7983b60f8d
5 files changed
+29
-36
No files matched your search
+1
-1
@@ -7,7 +7,7 @@ function newPopup(url) {
|
||||
}
|
||||
</script>
|
||||
</br>
|
||||
<span style="float: left;font-size: large;"><a href="/live/{{ user }}/index.m3u8">{{ user }}</a> | {{ streamtitle | escape }}</b></span><span style="float: right;font-size: large;"> Links | <a href="rtmp://{{ domain }}/live/{{ user }}">Watch</a> <a href="JavaScript:newPopup('/chat?room={{ user }}');">Chat</a> <a href="/vods/{{ user }}">VODs</a></span>
|
||||
<span style="float: left;font-size: large;"><a href="/live/{{ user }}/index.mpd">{{ user }}</a> | {{ streamtitle | escape }}</b></span><span style="float: right;font-size: large;"> Links | <a href="rtmp://{{ domain }}/live/{{ user }}">Watch</a> <a href="JavaScript:newPopup('/chat?room={{ user }}');">Chat</a> <a href="/vods/{{ user }}">VODs</a></span>
|
||||
<div id="jscontainer">
|
||||
<div id="jschild" style="width: 70%;height: 100%;">
|
||||
<video controls poster="/thumbnail.jpg" class="video-js vjs-default-skin" id="live-video" style="width:100%;height:100%;"></video>
|
||||
|
||||
Reference in new issue
Block a user