diff options
Diffstat (limited to 'model')
| -rw-r--r-- | model/Room.php | 18 | ||||
| -rw-r--r-- | model/Stream.php | 10 |
2 files changed, 7 insertions, 21 deletions
diff --git a/model/Room.php b/model/Room.php index 897bcbd..b0f700a 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'; @@ -386,7 +373,7 @@ class Room throw new NotFoundException('Selection '.$selection.' in Room '.$this->getSlug()); $translation_label = null; - if ($language !== 'native' && $language !== 'stereo') { + if ($language !== 'native') { if (! $this->hasTranslation()) { throw new NotFoundException('Translated Streams of Room '. $this->getSlug()); } @@ -402,9 +389,6 @@ class Room public function createStreamObject($selection, $language = 'native', $languageLabel = null) { - if($language == 'native' && $this->hasStereo()) - $language = 'stereo'; - return new Stream($this, $selection, $language, $languageLabel); } } diff --git a/model/Stream.php b/model/Stream.php index e260ef9..0abfed2 100644 --- a/model/Stream.php +++ b/model/Stream.php @@ -33,8 +33,7 @@ class Stream public function isTranslated() { return !empty($this->getLanguage()) && - $this->getLanguage() !== 'native' && - $this->getLanguage() !== 'stereo'; + $this->getLanguage() !== 'native'; } public function getVideoSize() @@ -150,10 +149,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 +160,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; |