Various fixes

Dash-Industry-Forum · Jul 5, 2024 · 07dfefe · 07dfefe
1 parent c29b38b
commit 07dfefe
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/DASH/LowLatency/impl/validate9X44.php b/DASH/LowLatency/impl/validate9X44.php
@@ -32,9 +32,13 @@
         $segmentProfiles = $representation['segmentProfiles'];
     }
 
-    $isSegmentStarts = $infoFileAdapt[$representationId]['isSegmentStart'];
-    $presStarts = $infoFileAdapt[$representationId]['PresStart'];
-    $presEnds = $infoFileAdapt[$representationId]['NextPresStart'];
+    $isSegmentStarts = $infoFileAdaptation[$representationId]['isSegmentStart'];
+    $presStarts = $infoFileAdaptation[$representationId]['PresStart'];
+    $presEnds = $infoFileAdaptation[$representationId]['NextPresStart'];
+
+    if (!$isSegmentStarts){
+      continue;
+    }
 
     $segmentIndexes = array_keys($isSegmentStarts, '1');
     $segmentCount = sizeof($segmentIndexes);

diff --git a/DASH/LowLatency/impl/validate9X45.php b/DASH/LowLatency/impl/validate9X45.php
@@ -34,9 +34,10 @@
     $chunkedAdaptationPoints[$representationId] = 3;
 
     // Bullet 3
-    $isSegmentStarts = $infoFileAdapt[$representationId]['isSegmentStart'];
-    $presStarts = $infoFileAdapt[$representationId]['PresStart'];
-    $presEnds = $infoFileAdapt[$representationId]['NextPresStart'];
+    $isSegmentStarts = $infoFileAdaptation[$representationId]['isSegmentStart'];
+    $presStarts = $infoFileAdaptation[$representationId]['PresStart'];
+    $presEnds = $infoFileAdaptation[$representationId]['NextPresStart'];
+    if (!$isSegmentStarts){continue;}
     $segmentIndexes = array_keys($isSegmentStarts, '1');
     foreach ($segmentIndexes as $segmentIndexId => $segmentIndex) {
         $presStart = $presStarts[$segmentIndex];

diff --git a/DASH/LowLatency/impl/validateSegmentTimeline.php b/DASH/LowLatency/impl/validateSegmentTimeline.php
@@ -2,9 +2,11 @@
 
 global $mpdHandler, $period_timing_info;
 
-$isSegmentStarts = $infoFileAdapt[$representation_id]['isSegmentStart'];
-$presentationStarts = $infoFileAdapt[$representation_id]['PresStart'];
-$presentationEnds = $infoFileAdapt[$representation_id]['NextPresStart'];
+$isSegmentStarts = $infoFileAdaptation[$representation_id]['isSegmentStart'];
+$presentationStarts = $infoFileAdaptation[$representation_id]['PresStart'];
+$presentationEnds = $infoFileAdaptation[$representation_id]['NextPresStart'];
+
+if (!$isSegmentStarts){return;}
 
 $segmentIndexes = array_keys($isSegmentStarts, '1');
 $segmentCount = sizeof($segmentIndexes);

diff --git a/Utils/moduleLogger.php b/Utils/moduleLogger.php
@@ -80,7 +80,9 @@ public function merge($l)
                 if ($hook == 'verdict') {
                     continue;
                 }
-                $hookValues['verdict'] = $this->selectVerdict($hookValues['verdict']);
+                if (gettype($hookValues) == "array"){
+                  $hookValues['verdict'] = $this->selectVerdict($hookValues['verdict']);
+                }
             }
         }
     }