Fixed errors and warnings triggered by issue #707

HbbTV_DVB/impl/dvbAudioChecks.php

@@ -20,16 +20,16 @@
 
         if ($role->getAttribute('value') == 'main') {
             $this->mainAudioFound = true;
-            $this->mainAudios[] = $adaptations;
+            $this->mainAudios[] = $adaptation;
         }
     }
 }
 
-$accesibilityRoles = array();
-$accesibilities = $adaptation->getElementsByTagName("Accessibility");
-foreach ($accesibilities as $accesibility) {
+$accessibilityRoles = array();
+$accessibilities = $adaptation->getElementsByTagName("Accessibility");
+foreach ($accessibilities as $accessibility) {
     if ($accessibility->getAttribute('schemeIdUri') == 'urn:tva:metadata:cs:AudioPurposeCS:2007') {
-        $accessibilityRoles[] = $accesibility->getAttribute('value');
+        $accessibilityRoles[] = $accessibility->getAttribute('value');
     }
 }
 

HbbTV_DVB/impl/dvbEventChecks.php

@@ -3,7 +3,7 @@
 if ($eventStream->getAttribute('schemeIdUri') != 'urn:dvb:iptv:cpm:2014') {
     return;
 }
-if ($eventStream->getAttribute('value') = '1') {
+if ($eventStream->getAttribute('value') != '1') {
     return;
 }
 

HbbTV_DVB/impl/dvbMPDValidator.php

@@ -182,7 +182,7 @@ function ($v, $k) {
         if ($child->nodeName == 'EventStream') {
             $this->dvbEventChecks($child);
         }
-        if ($child->nodename == 'SegmentTemplate') {
+        if ($child->nodeName == 'SegmentTemplate') {
             if (DASHIF\Utility\mpdContainsProfile('urn:dvb:dash:profile:dvb-dash:isoff-ext-on-demand:2014')) {
                 $invalidSegmentTemplateFound = true;
             }
@@ -250,8 +250,8 @@ function ($v, $k) {
             $adaptationSetProfileExists,
             "WARN",
             "Check succeeded",
-            "Check failed: Contains clause 4.1: " . ($adaptationSetContainsDVBDash ? "Yes" : "No") .
-            ", contains either 4.2.5 or 4.2.8: " . ($adaptationSetContainsExtension ? "Yes" : "No"),
+            "Check failed: Contains clause 4.1: " . ($adaptationContainsDVBDash ? "Yes" : "No") .
+            ", contains either 4.2.5 or 4.2.8: " . ($adaptationContainsExtension ? "Yes" : "No"),
         );
 
         $representations = $adaptationSet->getElementsByTagName("Representation");
@@ -270,7 +270,7 @@ function ($v, $k) {
         $videoComponentFound = false;
         $audioComponentFound = false;
 
-        if ($ch) {
+        if (isset($ch) && $ch) {
             $contentComponents = $ch->getElementsByTagName("ContentComponent");
             foreach ($contentComponents as $component) {
                 $contentType = $component->getAttribute("contentType");
@@ -393,18 +393,18 @@ function ($v, $k) {
             "$this->adaptationVideoCount adaptations found, none labeled as main for period $this->periodCount"
         );
 
-        $this->dvbContentProtection($adaptationSet, $representations, $i, $cenc);
+        $this->dvbContentProtection($adaptationSet, $representations, $i, $cencAttribute);
     }
 
     if ($hasVideoService) {
         $this->streamBandwidthCheck();
     }
 
-    if ($audioAdaptations->length > 1) {
+    if (count($audioAdaptations) > 1) {
         $this->fallbackOperationChecks($audioAdaptations);
     }
 
-    if ($mainAudioFound && !empty($hoh_subtitle_lang)) {
+    if ($this->mainAudioFound && !empty($hoh_subtitle_lang)) {
         $mainLanguage = array();
         foreach ($main_audios as $main_audio) {
             if ($main_audio->getAttribute('lang') != '') {
@@ -443,13 +443,14 @@ function ($v, $k) {
 
 $this->dvbAssociatedAdaptationSetsCheck();
 
+$audioCount = count($audioAdaptations);
 $logger->test(
     "HbbTV-DVB DASH Validation Requirements",
     "DVB: Section 6.1.2",
     "If there is more than one audio Adaptation Set in a DASH Presentation then at least one of them SHALL be " .
     "tagged with an @value set to \"main\"",
-    $audioAdaptations->length <= 1 || $this->mainAudioFound,
+    $audioCount <= 1 || $this->mainAudioFound,
     "FAIL",
-    "$audioAdaptations->length adaptation(s) found with main label if needed in Presentation",
-    "$audioAdaptations->length adaptations found but none of them are labeled as main in Presentation"
+    "$audioCount adaptation(s) found with main label if needed in Presentation",
+    "$audioCount adaptations found but none of them are labeled as main in Presentation"
 );

HbbTV_DVB/impl/dvbMpdAnchorCheck.php

@@ -3,6 +3,9 @@
 global $mpdHandler, $logger;
 $allowedKeys = array('t', 'period', 'track', 'group');
 
+if (!array_key_exists("urlcode", $_POST)) {
+    return;
+}
 $anchors = explode('#', json_decode($_POST['urlcode'])[0]);
 if (sizeof($anchors) <= 1) {
     return;

HbbTV_DVB/impl/fallbackOperationChecks.php

@@ -1,7 +1,7 @@
 <?php
 
 $adaptationCount = sizeof($audioAdaptations);
-for ($i = 0; $i < $len; $i++) {
+for ($i = 0; $i < $adaptationCount; $i++) {
     $adaptation = $audioAdaptations[$i];
     $supplementalProperties = $adaptation->getElementsByTagName('SupplementalProperty');
 

HbbTV_DVB/impl/mpdUpdateConstraintsWithinPeriod.php

@@ -44,8 +44,8 @@
             $spec,
             $section,
             "A Role Element " . $shallNotChangeInPeriod,
-            $mpd->getAdaptationSetAttribute($periodIndex, $origIndex, "Role") ==
-              $nextMpd->getAdaptationSetAttribute($nextPeriodIndex, $nextIndex, "Role"),
+            $mpd->getAdaptationSetChild($periodIndex, $origIndex, "Role") ==
+              $nextMpd->getAdaptationSetChild($nextPeriodIndex, $nextIndex, "Role"),
             "FAIL",
             "Role for AdaptationSet@id $origId within period $periodId identical",
             "Role for AdaptationSet@id $origId within period $periodId differs"

Utils/ArgumentsParser.php

@@ -21,8 +21,8 @@ public function parseAll()
         $this->parsedOptions = getopt($this->getShortOpts(), $this->getLongOpts(), $restidx);
 
         global $argv;
-        if ($argv){
-          $this->extraArguments = array_slice($argv, $restidx);
+        if ($argv) {
+            $this->extraArguments = array_slice($argv, $restidx);
         }
 
 
@@ -37,21 +37,22 @@ public function parseAll()
 
     public function getOption($name)
     {
-        if ($_REQUEST[$name]) {
+        if (array_key_exists($name, $_REQUEST) && $_REQUEST[$name]) {
             return true;
         }
-        if ($this->parsedOptions){
-        foreach ($this->allOptions as $option) {
-            if ($option->label == $name) {
-                if (
-                    array_key_exists($option->short[0], $this->parsedOptions) ||
-                    array_key_exists($option->long, $this->parsedOptions)
-                ) {
-                    return true;
+        if ($this->parsedOptions) {
+            foreach ($this->allOptions as $option) {
+                if ($option->label == $name) {
+                    if (
+                        (strlen($option->short) > 0 &&
+                        array_key_exists($option->short[0], $this->parsedOptions)) ||
+                        array_key_exists($option->long, $this->parsedOptions)
+                    ) {
+                        return true;
+                    }
                 }
             }
         }
-        }
         return false;
     }
 
@@ -80,7 +81,7 @@ public function addOption($label, $short, $long, $desc)
 
     public function getPositionalArgument($argname)
     {
-        if ($argname == "url" && $_REQUEST["url"]) {
+        if ($argname == "url" && array_key_exists("url", $_REQUEST) && $_REQUEST["url"]) {
             return urldecode($_REQUEST["url"]);
         }
         switch ($argname) {

Utils/MPDHandler.php

@@ -102,6 +102,14 @@ public function getAdaptationSetAttribute($idx, $aIdx, $attr): string | null
         }
         return $adaptationSetFeatures[$attr];
     }
+    public function getAdaptationSetChild($idx, $aIdx, $childName)
+    {
+        $adaptationSetFeatures = $this->features["Period"][$idx]["AdaptationSet"][$aIdx];
+        if (!array_key_exists($childName, $adaptationSetFeatures)) {
+            return null;
+        }
+        return $adaptationSetFeatures[$childName];
+    }
     public function getRepresentationAttribute($idx, $aIdx, $rIdx, $attr): string | null
     {
         $representationFeatures = $this->features["Period"][$idx]["AdaptationSet"][$aIdx]['Representation'][$rIdx];
@@ -156,7 +164,7 @@ public function getRepresentationIds($periodId, $adaptationSetId)
     {
         return include 'impl/MPDHandler/getRepresentationIds.php';
     }
-  
+
 
     public function selectPeriod($period)
     {
@@ -229,7 +237,7 @@ private function recursiveExtractFeatures($node)
 
     public function getPeriodTimingInfo($periodIndex = null)
     {
-        return include 'impl/MPDHandler/getPeriodTimingInfo.php';
+        return $this->getPeriodDurationInfo($periodIndex ? $periodIndex : $this->selectedPeriod);
     }
 
     private function getPeriodDurationInfo($period)
@@ -321,7 +329,6 @@ public function getMPD()
         return $this->mpd;
     }
 
-
     public function getDom()
     {
         return $this->dom;

Utils/MPDUtility.php

@@ -21,7 +21,7 @@ function in_array_at_least_one($options, $array)
 function isAbsoluteURL($URL)
 {
     $parsedUrl = parse_url($URL);
-    return $parsedUrl['scheme'] && $parsedUrl['host'];
+    return array_key_exists("scheme", $parsedUrl) && array_key_exists("host", $parsedUrl);
 }
 
 function inString($option, $string)
@@ -163,9 +163,9 @@ function mergeSegmentAccess($highLevel, $lowLevel)
 function formSegmentAccess($highLevel, $lowLevel)
 {
     foreach ($highLevel as $key => $highValue) {
-        $lowValue = $lowLevel[$key];
+        $lowValue = array_key_exists($key, $lowLevel) ? $lowLevel[$key] : array();
         foreach ($highValue as $k => $v) {
-            if (!$lowValue[$k]) {
+            if (!array_key_exists($k, $lowValue) || !$lowValue[$k]) {
                 $lowValue[$k] = $v;
             } elseif (gettype($lowValue[$k]) == 'array') {
                 //$v would also work, but this is more clear in meaning

Utils/Process_cli.php

@@ -15,9 +15,15 @@
  */
 
 
-if(!defined('STDIN'))  define('STDIN',  fopen('php://stdin',  'rb'));
-if(!defined('STDOUT')) define('STDOUT', fopen('php://stdout', 'wb'));
-if(!defined('STDERR')) define('STDERR', fopen('php://stderr', 'wb'));
+if (!defined('STDIN')) {
+    define('STDIN', fopen('php://stdin', 'rb'));
+}
+if (!defined('STDOUT')) {
+    define('STDOUT', fopen('php://stdout', 'wb'));
+}
+if (!defined('STDERR')) {
+    define('STDERR', fopen('php://stderr', 'wb'));
+}
 
 ini_set('memory_limit', '-1');
 ini_set('display_errors', 'stderr');
@@ -33,9 +39,6 @@
 require __DIR__ . '/moduleInterface.php';
 include __DIR__ . '/moduleLogger.php';
 
-include __DIR__ . '/Session.php';         //#Session Functions, No Direct Executable Code
-//#Document loading functions, mostly xml. Some assertion options and error initialization
-include __DIR__ . '/Load.php';
 include __DIR__ . '/FileOperations.php';  //#Filesystem and XML checking functions. No Direct Executable Code.
 //#Global variables. Direct evaluation of post/session vars to define conditionals,
 //#conditional extra includes for module initialization
@@ -77,13 +80,9 @@
 
 //#Cross repo includes. These should be made optional at the very least.
 include __DIR__ . '/../DASH/processMPD.php';
-include __DIR__ . '/../DASH/MPDFeatures.php';
-include __DIR__ . '/../DASH/validateMPD.php';
-include __DIR__ . '/../DASH/MPDInfo.php';
 include __DIR__ . '/../DASH/SchematronIssuesAnalyzer.php';
 include __DIR__ . '/../DASH/cross_validation.php';
 include __DIR__ . '/../DASH/Representation.php';
-include __DIR__ . '/../DASH/SegmentURLs.php';
 include __DIR__ . '/../HLS/HLSProcessing.php';
 include __DIR__ . '/Featurelist.php';
 

Utils/impl/MPDHandler/computeDynamicIntervals.php

@@ -7,13 +7,16 @@
   DASHIF\Utility\timeParsing($this->features['timeShiftBufferDepth']) : INF;
 
 $AST = $this->features['availabilityStartTime'];
+$segmentduration = 0;
 if ($segmentAccess['SegmentTimeline'] != null) {
-    $segmentduration = ($segmentTimings[$segmentCount - 1] - $segmentTimings[0]) / ((float)($segmentCount - 1));
+    if (count($segmentTimings) > 1) {
+        $segmentduration = ($segmentTimings[$segmentCount - 1] - $segmentTimings[0]) / ((float)($segmentCount - 1));
+    }
 } else {
     $segmentduration = ($segmentAccess['duration'] != null) ? $segmentAccess['duration'] : 0;
 }
 $timescale = ($segmentAccess['timescale'] != null) ? $segmentAccess['timescale'] : 1;
-$availabilityTimeOffset = ($segmentAccess['availabilityTimeOffset'] != null &&
+$availabilityTimeOffset = (array_key_exists("availabilityTimeOffset", $segmentAccess) &&
   $segmentAccess['availabilityTimeOffset'] != 'INF') ? $segmentAccess['availabilityTimeOffset'] : 0;
 
 $pto = ($segmentAccess['presentationTimeOffset'] != '') ?
@@ -40,6 +43,10 @@
 $avgsum = array_sum($avgsum) / sizeof($avgsum);
 $percent = $avgsum / $sumbandwidth;
 
+if ($segmentduration == 0) {
+    $segmentduration = 1;
+}
+
 $buffercapacity = $bufferduration / $segmentduration; //actual buffer capacity
 
 date_default_timezone_set("UTC"); //Set default timezone to UTC

Utils/impl/MPDHandler/computeTiming.php

@@ -15,22 +15,22 @@
 $start = 0;
 
 $duration = 0;
-if ($segmentAccess['duration'] != null) {
+if (array_key_exists("duration", $segmentAccess)) {
     $duration = $segmentAccess['duration'];
 }
 
 $timescale = 1;
-if ($segmentAccess['timescale'] != null) {
+if (array_key_exists("timescale", $segmentAccess)) {
     $timescale = $segmentAccess['timescale'];
 }
 
 $availabilityTimeOffset = 0;
-if ($segmentAccess['availabilityTimeOffset'] != null && $segmentAccess['availabilityTimeOffset'] != 'INF') {
+if (array_key_exists("availabilityTimeOffset", $segmentAccess) && $segmentAccess['availabilityTimeOffset'] != 'INF') {
     $availabilityTimeOffset =  $segmentAccess['availabilityTimeOffset'];
 }
 
 $presentationTimeOffset = 0;
-if ($segmentAccess['presentationTimeOffset'] != '') {
+if (array_key_exists("presentationTimeOffset", $segmentAccess) && $segmentAccess['presentationTimeOffset'] != '') {
     $presentationTimeOffset = (int)($segmentAccess['presentationTimeOffset']) / $timescale;
 }
 
@@ -69,11 +69,11 @@
 foreach ($segmentEntries as $index => $segmentEntry) {
     $d = $segmentEntry['d'];
     $r = 0;
-    if ($segmentEntry['r']) {
+    if (array_key_exists("r", $segmentEntry)) {
         $r = $segmentEntry['r'];
     }
     $t = 0;
-    if ($segmentEntry['t']) {
+    if (array_key_exists("t", $segmentEntry)) {
         $t = $segmentEntry['t'];
     }
     $t -= $timeOffset;

Utils/impl/MPDHandler/computeUrls.php

@@ -6,7 +6,7 @@
 $id = $representation['id'];
 
 $startNumber = 1;
-if ($segmentAccess['startNumber'] != null) {
+if (array_key_exists("startNumber", $segmentAccess)) {
     $startNumber =  $segmentAccess['startNumber'];
 }
 
@@ -44,9 +44,13 @@
 
 ///\Todo translate checks below into actual "check"
 while ($index < $segmentCount) {
+    $timeReplace = 0;
+    if (array_key_exists($currentTime, $segmentInfo)) {
+        $timeReplace = $segmentInfo[$currentTime];
+    }
     $segmentUrl = str_replace(
         array('$Bandwidth$', '$Number$', '$RepresentationID$', '$Time$'),
-        array($bandwidth, $index + $startNumber, $id, $segmentInfo[$currentTime]),
+        array($bandwidth, $index + $startNumber, $id, $timeReplace),
         $media
     );