diff options
| author | MaZderMind | 2014-12-02 23:57:38 +0100 |
|---|---|---|
| committer | MaZderMind | 2014-12-02 23:57:38 +0100 |
| commit | 9a3c16aecb0fcd28f3c9cd126db4495d7a783769 (patch) | |
| tree | 0b46138c97501a24cc95e9faf4ef99cad5ebbc86 | |
| parent | 866b1ec28af165142a62d80d4dccb2e9b59ad002 (diff) | |
slide-stream will be delivered as a ultra-low-bitrate video
not as jpegs like last year
| -rw-r--r-- | assets/js/lustiges-script.js | 21 | ||||
| -rw-r--r-- | template/assemblies/player/slides.phtml | 41 |
2 files changed, 28 insertions, 34 deletions
diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index 44e5e3e..0e9af2f 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -162,27 +162,6 @@ $(function() { }); }); -// slide-stream -$(function() { - var - updateTimer = 5000, /* reload slide image 5 seconds after the previous image was loaded */ - $template = $('img.slide.template').clone().detach(); - - function updateSlideImage() { - // no way around breaking the cache hard in FF - // -> https://bugzilla.mozilla.org/show_bug.cgi?id=295942 - $template - .clone() - .on('load', function() { - $(this).replaceAll($('img.slide')); - setTimeout(updateSlideImage, updateTimer); - }) - .attr('src', $template.data('src')+'?'+Date.now()); - } - - updateSlideImage(); -}); - // startpage program teaser $(function() { var diff --git a/template/assemblies/player/slides.phtml b/template/assemblies/player/slides.phtml index f26163a..c2720d6 100644 --- a/template/assemblies/player/slides.phtml +++ b/template/assemblies/player/slides.phtml @@ -1,13 +1,28 @@ -<img - width="1024" - height="576" - - data-src="<?=h(link_stream('slide', $room, null, $translated))?>" - - alt="<?=h($title)?>" - class="slide template" -/> - -<div class="slide-audio"> - <? include('audio.phtml') ?> -</div> +<div style="width: 100%; height: 100%; max-width: <?=h($width)?>px; margin: 0 auto;"> + <video + autoplay="autoplay" + preload="auto" + width="<?=h($width)?>" + height="<?=h($height)?>" + style="width: 100%; height: 100%;" + > + <!--source + data-plugin-type="native" + src="<?=h(link_stream('webm', $room, 'webm_slides', $translated))?>" + title="WebM (Icecast)" + type="video/webm" + /--> + <source + data-plugin-type="flash" + src="<?=h(link_stream('rtmp', $room, 'slides', $translated))?>" + title="h.264 (RTMP)" + type="video/rtmp" + /> + <source + data-plugin-type="native" + src="<?=h(link_stream('hls', $room, 'slides', $translated))?>" + title="h.264 (HLS)" + type="application/vnd.apple.mpegURL" + /> + </video> +</div>
\ No newline at end of file |