Changeset 1461 in SHVCSoftware

Timestamp:

21 Aug 2015, 02:13:49 (9 years ago)

Author:

seregin

Message:

update PTL check

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2892 +2892 @@
   vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0);
 
+  std::vector<Profile::Name> profiles;
+
+  if( vps->getScalabilityMask( VIEW_ORDER_INDEX ) )
+  {
+    profiles.push_back( Profile::MULTIVIEWMAIN );
+  }
+
+  if( vps->getScalabilityMask( SCALABILITY_ID ) )
+  {
+    profiles.push_back( Profile::SCALABLEMAIN );
+  }
+
   for(i = 1; i < numOutputLayerSets; i++)
   {
@@ -2942 +2954 @@
 
     vps->getProfileLevelTierIdx(i)->assign(vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet), -1);
+
+    std::vector<UInt> passedCheck(profiles.size(), 0);
+    UInt numIncludedLayers = 0;
 
     for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
@@ -2961 +2976 @@
           if( vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j) != 0 && vps->getNecessaryLayerFlag(i, j) )
           {
-            std::vector<Profile::Name> profiles;
-
-            if( vps->getScalabilityMask( VIEW_ORDER_INDEX ) )
-            {
-              profiles.push_back( Profile::MULTIVIEWMAIN );
-            }
-
-            if( vps->getScalabilityMask( SCALABILITY_ID ) )
-            {
-              profiles.push_back( Profile::SCALABLEMAIN );
-            }
-            
             ProfileTierLevel* ptl = vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL();
-
-            Bool found = false;
+            numIncludedLayers++;
+            const Profile::Name profileName = ptl->getProfileIdc() == Profile::SCALABLEMAIN10 ? Profile::SCALABLEMAIN : ptl->getProfileIdc();
+
             for( Int p = 0; p < profiles.size(); p++ )
             {
-              found = ptl->getProfileIdc() == profiles[p] || ptl->getProfileCompatibilityFlag(Int(profiles[p]));
+              passedCheck[p] += profileName == profiles[p] || ptl->getProfileCompatibilityFlag(Int(profiles[p]));
             }
-
-            assert( found );
           }
         }
       }
     }
+
+    // check whether all layers are compatible to at least one extension profile
+    assert( std::find(passedCheck.begin(), passedCheck.end(), numIncludedLayers) != passedCheck.end() );
 
     NumOutputLayersInOutputLayerSet[i] = 0;