Changeset 1182 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

8 Jul 2015, 03:09:51 (9 years ago)

Author:

seregin

Message:

macro cleanup: DPB_PARAMS_MAXTLAYERS, MULTIPLE_PTL_SUPPORT

File:

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

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

@@ -2109 +2109 @@
   for (Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
-#if MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION
     READ_FLAG( uiCode, "sub_layer_profile_present_flag[i]" ); rpcPTL->setSubLayerProfilePresentFlag(i, uiCode);
 #else
@@ -2131 +2131 @@
   for(Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
-#if MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION
     if( rpcPTL->getSubLayerProfilePresentFlag(i) )
 #else
@@ -2183 +2183 @@
     READ_FLAG(    uiCode, "general_one_picture_only_constraint_flag");
     READ_FLAG(    uiCode, "general_lower_bit_rate_constraint_flag"); ptl->setLowerBitRateConstraintFlag(uiCode != 0);
-#if MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION
     READ_CODE(32, uiCode, "general_reserved_zero_34bits");  READ_CODE(2, uiCode, "general_reserved_zero_34bits");
   }
@@ -2662 +2662 @@
   {
     vps->setProfilePresentFlag(1, false);
-#if MULTIPLE_PTL_SUPPORT
     parsePTL( vps->getPTL(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
-#else
-    vps->getPTLForExtnPtr()->empty();
-    vps->getPTLForExtnPtr()->resize(2);
-    vps->getPTLForExtn(1)->copyProfileInfo( vps->getPTL() );
-    parsePTL( vps->getPTLForExtn(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
-#endif
   }
 
@@ -2857 +2850 @@
 
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
-#if !MULTIPLE_PTL_SUPPORT
-  vps->getPTLForExtnPtr()->resize(vps->getNumProfileTierLevel());
-#endif
-
-  for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++)
+
+  for( Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++ )
   {
     READ_FLAG( uiCode, "vps_profile_present_flag[i]" ); vps->setProfilePresentFlag(idx, uiCode ? true : false);
+
     if( !vps->getProfilePresentFlag(idx) )
     {
       // Copy profile information from previous one
-#if MULTIPLE_PTL_SUPPORT
       vps->getPTL(idx)->copyProfileInfo( vps->getPTL( idx - 1 ) );
-#else
-      vps->getPTLForExtn(idx)->copyProfileInfo( (idx==1) ? vps->getPTL() : vps->getPTLForExtn( idx - 1 ) );
-#endif
-    }
-#if MULTIPLE_PTL_SUPPORT
+    }
+
     parsePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
-#else
-    parsePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
-#endif
   }
 
@@ -2952 +2936 @@
 
     vps->getProfileLevelTierIdx(i)->assign(vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet), -1);
-    for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++)
+
+    for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
     {
       if( vps->getNecessaryLayerFlag(i, j) && (vps->getNumProfileTierLevel()-1) > 0 )
@@ -2959 +2944 @@
         vps->setProfileLevelTierIdx(i, j, uiCode );
 
-#if MULTIPLE_PTL_SUPPORT
         //For conformance checking
         //Conformance of a layer in an output operation point associated with an OLS in a bitstream to the Scalable Main profile is indicated as follows:
@@ -2977 +2961 @@
           }
         }
-#endif
       }
     }