Changeset 1169 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

8 Jul 2015, 01:20:27 (10 years ago)

Author:

seregin

Message:

macro cleanup: LIST_OF_PTL

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (4 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -53 +53 @@
 #define POC_RESET_VALUE_RESTRICTION      1      ///< R0223: Restriction on the value of full_poc_reset_flag
 #define PTL_SIGNALLING                   1      ///< Overall macro for all PTL-related signalling
-#if PTL_SIGNALLING
-#define LIST_OF_PTL                      1      ///< JCTVC-R0272: Signalling the PTL for the 0-th OLS
-#endif
+
 #define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
 #define VPS_VUI_BSP_HRD_PARAMS           1      ///< JCTVC-R0231: Define the VPS VUI BSP hrd_params() as a separate function, and apply changes adopted.

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

@@ -2672 +2672 @@
   Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
   Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
-#if LIST_OF_PTL
+
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
@@ -2685 +2685 @@
 #endif
   }
-#endif
 
   UInt numScalabilityTypes = 0, i = 0, j = 0;
@@ -2876 +2875 @@
   vps->getPTLForExtnPtr()->resize(vps->getNumProfileTierLevel());
 #endif
-#if LIST_OF_PTL
+
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++)
-#else
-  for(Int idx = 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
-#endif
   {
     READ_FLAG( uiCode, "vps_profile_present_flag[i]" ); vps->setProfilePresentFlag(idx, uiCode ? true : false);

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

@@ -1984 +1984 @@
   Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
   Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
-#if LIST_OF_PTL
+
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
@@ -1993 +1993 @@
 #endif
   }
-#endif
 
   UInt i = 0, j = 0;
@@ -2124 +2123 @@
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
 
-#if LIST_OF_PTL
 #if MULTIPLE_PTL_SUPPORT
   //Do something here to make sure the loop is correct to consider base layer internal stuff
@@ -2131 +2129 @@
 #endif
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++)
-#else
-  for(Int idx = 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
-#endif
   {
 #if MULTIPLE_PTL_SUPPORT