Changeset 942 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

30 Dec 2014, 20:36:14 (11 years ago)

Author:

seregin

Message:

code clean up

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1088 +1088 @@
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+    codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
+#else
     codePTL( vps->getPTLForExtn(1), false, vps->getMaxTLayers() - 1 );
-#else
-    codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
 #endif
   }
@@ -1258 +1258 @@
 #endif
 #if LIST_OF_PTL
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+  //Do something here to make sure the loop is correct to consider base layer internal stuff
+#else
   assert( vps->getNumProfileTierLevel() == vps->getPTLForExtnPtr()->size());
-#else
-  //Do something here to make sure the loop is correct to consider base layer internal stuff
 #endif
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
@@ -1278 +1278 @@
     }
 #endif
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+    codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#else
     codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
-#else
-    codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
 #endif
   }