Save presentation profile regardless of conformance in previous tests…

… for further processing (#674)
Dash-Industry-Forum · Jun 6, 2023 · 058375d · 058375d
1 parent 260e754
commit 058375d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 28 deletions.
diff --git a/CTAWAVE/impl/CTACheckPresentation.php b/CTAWAVE/impl/CTACheckPresentation.php
@@ -21,7 +21,7 @@
 for ($adaptationIndex = 0; $adaptationIndex < $adaptationCount; $adaptationIndex++) {
     $switchingSetMediaProfiles = array();
     $encryptedTracks = array();
-    if(is_null($periodIndex)) {
+    if (is_null($periodIndex)) {
         $periodIndex = $mpdHandler->getSelectedPeriod();
     }
     $location = $session->getAdaptationDir($periodIndex, $adaptationIndex);
@@ -108,6 +108,7 @@
 
 
 $presentationProfileArray = array();
+$conforms = false;
 if ($videoSelectionSetFound) {
     $conforms = $logger->test(
         "CTAWAVE",
@@ -119,14 +120,11 @@
         "Switching set found",
         "Switching set not found"
     );
-    if ($conforms) {
-        array_push(
-            $presentationProfileArray,
-            $this->getPresentationProfile($encryptedTrackFound, $cencSwSetFound, $cbcsSwSetFound)
-        );
-    } else {
-        array_push($presentationProfileArray, "");
-    }
+
+    array_push(
+        $presentationProfileArray,
+        $this->getPresentationProfile($encryptedTrackFound, $cencSwSetFound, $cbcsSwSetFound));
+
 }
 if ($audioSelectionSetFound) {
     $conforms = $logger->test(
@@ -139,14 +137,12 @@
         "Switching set found",
         "Switching set not found"
     );
-    if ($conforms) {
-        array_push(
-            $presentationProfileArray,
-            $this->getPresentationProfile($encryptedTrackFound, $cencSwSetFound, $cbcsSwSetFound)
-        );
-    } else {
-        array_push($presentationProfileArray, "");
-    }
+
+    array_push(
+        $presentationProfileArray,
+        $this->getPresentationProfile($encryptedTrackFound, $cencSwSetFound, $cbcsSwSetFound)
+    );
+
 }
 if ($subtitleSelectionSetFound) {
     $conforms = $logger->test(
@@ -159,14 +155,10 @@
         "Switching set found",
         "Switching set not found"
     );
-    if ($conforms) {
-        array_push(
-            $presentationProfileArray,
-            $this->getPresentationProfile($encryptedTrackFound, $cencSwSetFound, $cbcsSwSetFound)
-        );
-    } else {
-        array_push($presentationProfileArray, "");
-    }
+    array_push(
+        $presentationProfileArray,
+        $this->getPresentationProfile($encryptedTrackFound, $cencSwSetFound, $cbcsSwSetFound)
+    );
 }
 
 
@@ -179,8 +171,8 @@
 }
 
 
-if ($presentationProfile != ""){
-  $logger->message("Stream found to conform to a CMAF Presentation Profile: $presentationProfile");
+if ($presentationProfile != "" && $conforms) {
+    $logger->message("Stream found to conform to a CMAF Presentation Profile: $presentationProfile");
 }
 
 $this->presentationProfile = $presentationProfile;

diff --git a/CTAWAVE/impl/checkCMFHDBaselineConstraints.php b/CTAWAVE/impl/checkCMFHDBaselineConstraints.php
@@ -10,5 +10,5 @@
     $this->presentationProfile == "CMFHD",
     "FAIL",
     "All CMAF Switching sets are CMFHD conformant",
-    "Not all CMAF Switching sets are CMFHD conformant, found $presentationProfile"
+    "Not all CMAF Switching sets are CMFHD conformant, found $this->presentationProfile"
 );