From 6ca102c77d0d2e3e5da962dbf69596af866d039f Mon Sep 17 00:00:00 2001
From: Anton Schubert
Date: Sat, 2 May 2020 22:34:48 +0200
Subject: remove legacy video tab

---
 model/Room.php   | 13 -------------
 model/Stream.php |  7 +++++--
 2 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'model')

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;
-- 
cgit v1.2.3