isAudio and isVideo added to Broadcast

Author: SecondeJK

src/OpenTok/Broadcast.php

@@ -82,7 +82,11 @@ class Broadcast
     private $multiBroadcastTag;
     /** @ignore */
     private $resolution;
-    
+    /** @ignore */
+    private $isAudio;
+    /** @ignore */
+    private $isVideo;
+
     public function __construct($broadcastData, $options = array())
     {
         // unpack optional arguments (merging with default values) into named variables
@@ -98,9 +102,12 @@ public function __construct($broadcastData, $options = array())
             'isHls' => true,
             'isLowLatency' => false,
             'isDvr' => false,
+            'isAudio' => true,
+            'isVideo' => true
         );
+
         $options = array_merge($defaults, array_intersect_key($options, $defaults));
-        list($apiKey, $apiSecret, $apiUrl, $client, $isStopped, $streamMode) = array_values($options);
+        list($apiKey, $apiSecret, $apiUrl, $client, $isStopped, $streamMode, $isAudio, $isVideo) = array_values($options);
 
         // validate params
         Validators::validateBroadcastData($broadcastData);
@@ -118,6 +125,8 @@ public function __construct($broadcastData, $options = array())
         $this->isHls = isset($this->data['settings']['hls']);
         $this->isLowLatency = $this->data['settings']['hls']['lowLatency'] ?? false;
         $this->isDvr = $this->data['settings']['hls']['dvr'] ?? false;
+        $this->isAudio = $isAudio;
+        $this->isVideo = $isVideo;
 
         $this->client = isset($client) ? $client : new Client();
         if (!$this->client->isConfigured()) {
@@ -157,6 +166,10 @@ public function __get($name)
                 return $this->isDvr;
             case 'multiBroadcastTag':
                 return $this->multiBroadcastTag;
+            case 'isAudio':
+                return $this->isAudio;
+            case 'isVideo':
+                return $this->isVideo;
             default:
                 return null;
         }

src/OpenTok/OpenTok.php

@@ -820,19 +820,21 @@ public function startBroadcast(string $sessionId, array $options = []): Broadcas
             Validators::validateResolution($options['resolution']);
         }
 
-	    if (isset($options['output']['hls'])) {
-		    Validators::validateBroadcastOutputOptions($options['output']['hls']);
+	    if (isset($options['outputs']['hls'])) {
+		    Validators::validateBroadcastOutputOptions($options['outputs']['hls']);
 	    }
 
-		if (isset($options['output']['rtmp'])) {
-			Validators::validateRtmpStreams($options['output']['rtmp']);
+		if (isset($options['outputs']['rtmp'])) {
+			Validators::validateRtmpStreams($options['outputs']['rtmp']);
 		}
 
         $defaults = [
             'layout' => Layout::getBestFit(),
+            'hasAudio' => true,
+            'hasVideo' => true,
             'streamMode' => 'auto',
             'resolution' => '640x480',
-	        'output' => [
+	        'outputs' => [
 				'hls' => [
 	                'dvr' => false,
 					'lowLatency' => false
@@ -842,7 +844,7 @@ public function startBroadcast(string $sessionId, array $options = []): Broadcas
 
         $options = array_merge($defaults, $options);
 
-        list($layout, $streamMode) = array_values($options);
+        list($layout, $hasAudio, $hasVideo, $streamMode) = array_values($options);
 
         // validate arguments
         Validators::validateSessionId($sessionId);

tests/OpenTokTest/OpenTokTest.php

@@ -1409,7 +1409,7 @@ public function testCanStartBroadcastWithRmtp()
 		$sessionId = '2_MX44NTQ1MTF-fjE0NzI0MzU2MDUyMjN-eVgwNFJhZmR6MjdockFHanpxNzBXaEFXfn4';
 
 		$options = [
-			'output' => [
+			'outputs' => [
 				'hls' => [
 					'dvr' => true,
 					'lowLatency' => false
@@ -1451,7 +1451,7 @@ public function testCannotStartBroadcastWithOver5RtmpChannels(): void
 		$sessionId = '2_MX44NTQ1MTF-fjE0NzI0MzU2MDUyMjN-eVgwNFJhZmR6MjdockFHanpxNzBXaEFXfn4';
 
 		$options = [
-			'output' => [
+			'outputs' => [
 				'hls' => [
 					'dvr' => true,
 					'lowLatency' => false
@@ -1525,7 +1525,7 @@ public function testCanStartBroadcastWithDvrEnabled()
 		$sessionId = '2_MX44NTQ1MTF-fjE0NzI0MzU2MDUyMjN-eVgwNFJhZmR6MjdockFHanpxNzBXaEFXfn4';
 
 		$options = [
-			'output' => [
+			'outputs' => [
 				'hls' => [
 					'dvr' => true,
 					'lowLatency' => false
@@ -1552,7 +1552,7 @@ public function testCanStartBroadcastWithLowLatencyEnabled()
 		$sessionId = '2_MX44NTQ1MTF-fjE0NzI0MzU2MDUyMjN-eVgwNFJhZmR6MjdockFHanpxNzBXaEFXfn4';
 
 		$options = [
-			'output' => [
+			'outputs' => [
 				'hls' => [
 					'dvr' => true,
 					'lowLatency' => false
@@ -1581,7 +1581,7 @@ public function testCannotStartBroadcastWithBothHlsAndDvrEnabled()
 		$sessionId = '2_MX44NTQ1MTF-fjE0NzI0MzU2MDUyMjN-eVgwNFJhZmR6MjdockFHanpxNzBXaEFXfn4';
 
 		$options = [
-			'output' => [
+			'outputs' => [
 				'hls' => [
 					'dvr' => true,
 					'lowLatency' => true

tests/mock/v2/project/APIKEY/broadcast/BROADCASTID/start_default

@@ -22,5 +22,7 @@
   "partnerId":854511,
   "maxDuration":5400,
   "resolution": "1280x720",
-  "streamMode": "auto"
+  "streamMode": "auto",
+  "hasAudio": true,
+  "hasVideo": true
 }

tests/mock/v2/project/APIKEY/broadcast/BROADCASTID/start_dvr

@@ -22,5 +22,7 @@
   "partnerId":854511,
   "maxDuration":5400,
   "resolution": "1280x720",
-  "streamMode": "auto"
+  "streamMode": "auto",
+  "hasAudio": true,
+  "hasVideo": true
 }

tests/mock/v2/project/APIKEY/broadcast/BROADCASTID/start_ll

@@ -22,5 +22,7 @@
   "partnerId":854511,
   "maxDuration":5400,
   "resolution": "1280x720",
-  "streamMode": "auto"
+  "streamMode": "auto",
+  "hasAudio": true,
+  "hasVideo": true
 }