Changeset 1462 in SHVCSoftware

Timestamp:

21 Aug 2015, 18:43:51 (9 years ago)

Author:

seregin

Message:

update PTL check at encoder

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -2485 +2485 @@
   }
 
+  std::vector<Profile::Name> profiles;
+
+  if( m_scalabilityMask[VIEW_ORDER_INDEX] )
+  {
+    profiles.push_back( Profile::MULTIVIEWMAIN );
+  }
+
+  if( m_scalabilityMask[SCALABILITY_ID] )
+  {
+    profiles.push_back( Profile::SCALABLEMAIN );
+  }
+
   for( Int olsCtr = 1; olsCtr < m_numOutputLayerSets; olsCtr++ )
   {
@@ -2517 +2529 @@
     //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
     //The following assert may be updated / upgraded to take care of general_profile_compatibility_flag.
-    if (m_numAddLayerSets == 0)
-    {
-      for ( Int ii = 1; ii < m_numLayerInIdList[olsToLsIndex]; ii++)
-      {
-        if (m_layerSetLayerIdList[olsToLsIndex][ii - 1] != 0 && m_layerSetLayerIdList[olsToLsIndex][ii] != 0)  //Profile / profile compatibility of enhancement layers must indicate the same profile.
+    if( olsToLsIndex < m_numLayerSets )
+    {
+      std::vector<UInt> passedCheck(profiles.size(), 0);
+      UInt numIncludedLayers = 0;
+
+      for( Int ii = 1; ii < m_numLayerInIdList[olsToLsIndex]; ii++ )
+      {
+        if( m_layerSetLayerIdList[olsToLsIndex][ii - 1] != 0 && m_layerSetLayerIdList[olsToLsIndex][ii] != 0 )  //Profile / profile compatibility of enhancement layers must indicate the same profile.
         {
-          assert( (m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) ||
-            (m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) ||   
-            (m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) );
+          numIncludedLayers++;
+          const Profile::Name profileName = m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == Profile::SCALABLEMAIN10 ? Profile::SCALABLEMAIN : m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]];
+
+          for( Int p = 0; p < profiles.size(); p++ )
+          {
+            passedCheck[p] += profileName == profiles[p] || m_profileCompatibility[Int(profiles[p])];
+          }
         }
       }
+
+      // check whether all layers are compatible to at least one extension profile
+      assert( std::find(passedCheck.begin(), passedCheck.end(), numIncludedLayers) != passedCheck.end() );
     }
   }