aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--model/Room.php13
-rw-r--r--model/Stream.php7
-rw-r--r--template/assemblies/player/video.phtml30
-rw-r--r--template/assemblies/switcher/dash.phtml2
-rw-r--r--template/assemblies/switcher/video.phtml79
-rw-r--r--view/streams-json-v1.php2
6 files changed, 7 insertions, 126 deletions
diff --git a/model/Room.php b/model/Room.php
index 897bcbd..ad4d58d 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -184,10 +184,6 @@ class Room
return $this->getConference()->get('ROOMS.'.$this->getSlug().'.HD_VIDEO');
}
- public function hasVideo() {
- return $this->hasSdVideo() || $this->hasHdVideo();
- }
-
public function hasAudio() {
return $this->getConference()->get('ROOMS.'.$this->getSlug().'.AUDIO');
}
@@ -262,12 +258,6 @@ class Room
if($this->hasMusic())
$selections[] = 'music';
- if($this->hasHdVideo())
- $selections[] = 'hd';
-
- if($this->hasSdVideo())
- $selections[] = 'sd';
-
if($this->hasSlides())
$selections[] = 'slides';
@@ -291,9 +281,6 @@ class Room
if($this->hasMusic())
$tabs[] = 'music';
- if($this->hasVideo())
- $tabs[] = 'video';
-
if($this->hasSlides())
$tabs[] = 'slides';
diff --git a/model/Stream.php b/model/Stream.php
index e260ef9..5f803b6 100644
--- a/model/Stream.php
+++ b/model/Stream.php
@@ -150,10 +150,10 @@ class Stream
{
case 'webm':
if($this->getSelection() == 'hd')
- return '1920x1080, VP8+Vorbis in WebM, 3.5 MBit/s';
+ return '1920x1080, VP9+Opus in WebM, 3.5 MBit/s';
else if($this->getSelection() == 'sd')
- return '1024x576, VP8+Vorbis in WebM, 1 MBit/s';
+ return '1024x576, VP9+Opus in WebM, 1 MBit/s';
case 'hls':
if($this->getSelection() == 'hd')
@@ -161,6 +161,9 @@ class Stream
else if($this->getSelection() == 'sd')
return '1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s';
+
+ case 'dash':
+ return 'VP9+Opus mit WebM-Segmenten';
}
return null;
diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
deleted file mode 100644
index 3eae170..0000000
--- a/template/assemblies/player/video.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<div
- style="max-width: <?=h($stream->getVideoWidth())?>px; max-height: <?=h($stream->getVideoHeight())?>px;"
- class="video-wrap <? if($room->hasSubtitles()): ?>has-subtitles<? endif ?>"
- data-subtitles-room-id="<?=h($room->getSubtitlesRoomId())?>"
->
- <video
- <? if(!isset($autoplay) || $autoplay == true): ?>
- autoplay="autoplay"
- <? endif ?>
- preload="auto"
- width="<?=h($stream->getVideoWidth())?>"
- height="<?=h($stream->getVideoHeight())?>"
- poster="<?=h($stream->getPoster())?>"
- style="width: 100%; height: 100%;"
- class="mejs"
- >
- <source
- data-plugin-type="native"
- src="<?=h($stream->getVideoUrl('webm'))?>"
- title="WebM (Icecast)"
- type="video/webm"
- />
- <source
- data-plugin-type="native"
- src="<?=h($stream->getVideoUrl('hls'))?>"
- title="h.264 (HLS)"
- type="application/vnd.apple.mpegURL"
- />
- </video>
-</div>
diff --git a/template/assemblies/switcher/dash.phtml b/template/assemblies/switcher/dash.phtml
index 485b5e1..41077b4 100644
--- a/template/assemblies/switcher/dash.phtml
+++ b/template/assemblies/switcher/dash.phtml
@@ -44,7 +44,7 @@
<div class="row">
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
- <div class="btn-group" role="group">
+ <div class="btn-group" role="group" title="<?=h($switcherstream->getVideoTech("dash"))?>">
<div class="btn btn-primary" disabled>DASH</div>
<a href="<?=h($room->getDashManifestUrl())?>" target="_blank" class="btn btn-default">
<span class="fa fa-flask"></span>
diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml
deleted file mode 100644
index ae2815f..0000000
--- a/template/assemblies/switcher/video.phtml
+++ /dev/null
@@ -1,79 +0,0 @@
-<div class="container-fluid">
- <h3>Video</h3>
- <div class="formats row">
-
- <? foreach($room->getVideoResolutions() as $res): ?>
- <? $selection = $room->createSelectionObject($res) ?>
- <div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
- <div class="btn-group" role="group">
- <div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
-
- <? if($room->hasTranslation()): ?>
-
- <a href="<?=h($selection->getLink())?>" class="btn btn-primary">
- <span class="fa fa-flag-o"></span>
- Native
- </a>
- <? foreach($room->getTranslations() as $translation): ?>
- <a href="<?=h($selection->getTranslatedLink($translation['endpoint']))?>" class="btn btn-primary">
- <span class="fa fa-flag"></span>
- <?=h(ucfirst($translation['label']))?>
- </a>
- <? endforeach ?>
-
- <? else: ?>
-
- <a href="<?=h($selection->getLink())?>" class="btn btn-primary">
- <span class="fa fa-video-camera"></span>
- Video
- </a>
-
- <? endif ?>
- </div>
- </div>
- <? endforeach ?>
-
- </div>
-
- <div class="notes well">
- <? include("$assemblies/desktop-player.phtml") ?>
- </div>
-
- <div class="directlinks">
- <? foreach(Stream::getVideoProtos() as $proto => $display): ?>
- <h3>Direct links (<?=h($display)?>)</h3>
- <div class="row">
- <? foreach($room->getVideoResolutions() as $res): ?>
- <? $selection = $room->createSelectionObject($res) ?>
- <? $switcherstream = $room->createStreamObject($res) ?>
- <div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
- <div class="btn-group" role="group" title="<?=h($switcherstream->getVideoTech($proto))?>">
- <div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
- <? if($room->hasTranslation()): ?>
-
- <a href="<?=h($room->createStreamObject($res, 'native')->getVideoUrl($proto))?>" class="btn btn-default">
- <span class="fa fa-flag-o"></span>
- Native
- </a>
- <? foreach($room->getTranslations() as $translation): ?>
- <a href="<?=h($room->createStreamObject($res, $translation['endpoint'])->getVideoUrl($proto))?>" class="btn btn-default">
- <span class="fa fa-flag"></span>
- <?=h(ucfirst($translation['label']))?>
- </a>
- <? endforeach ?>
-
- <? else: ?>
-
- <a href="<?=h($switcherstream->getVideoUrl($proto))?>" class="btn btn-default">
- <span class="fa fa-video-camera"></span>
- Video
- </a>
-
- <? endif ?>
- </div>
- </div>
- <? endforeach ?>
- </div>
- <? endforeach ?>
- </div>
-</div>
diff --git a/view/streams-json-v1.php b/view/streams-json-v1.php
index 055f6bc..d394384 100644
--- a/view/streams-json-v1.php
+++ b/view/streams-json-v1.php
@@ -66,7 +66,7 @@ foreach (Conferences::getActiveConferences() as $conference)
case 'dash':
$urls['dash'] = array(
- 'display' => $display,
+ 'display' => "MPEG-Dash",
'tech' => $room->getDashTech(),
'url' => $room->getDashManifestUrl(),
);