Changeset 1169 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: LIST_OF_PTL

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (4 diffs)

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

@@ -1424 +1424 @@
     }
   }
-    vps->setIlpSshSignalingEnabledFlag(false);
-#if VPS_EXTN_PROFILE_INFO
-#if !MULTIPLE_PTL_SUPPORT
-#if LIST_OF_PTL
-  vps->getPTLForExtnPtr()->resize(1);   // Dummy object - unused.
-  for(i = 0; i < vps->getMaxLayers(); i++)
-  {
-    // TODO: The profile tier level have to be given support to be included in the configuration files
-    if(i == 0)
-    {
-      if( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 )
-      {
-        vps->setProfilePresentFlag(1, false);
-        vps->getPTLForExtnPtr()->push_back( *(m_acTEncTop[0].getSPS()->getPTL()) );
-      }
-    }
-    else  // i > 0
-    {
-      vps->setProfilePresentFlag(i, true);
-      // Note - may need to be changed for other layer structures.
-      vps->getPTLForExtnPtr()->push_back( *(m_acTEncTop[0].getSPS()->getPTL()) );
-    }
-  }
-#else
-  vps->getPTLForExtnPtr()->resize(vps->getNumLayerSets());
-  for(Int setId = 1; setId < vps->getNumLayerSets(); setId++)
-  {
-    vps->setProfilePresentFlag(setId, true);
-    // Note - may need to be changed for other layer structures.
-    *(vps->getPTLForExtn(setId)) = *(m_acTEncTop[setId].getSPS()->getPTL());
-  }
-#endif
-#endif
-#endif
+
+  vps->setIlpSshSignalingEnabledFlag(false);
 
   // Direct reference layers
@@ -1556 +1524 @@
     }
   }
-
+#endif
   // Target output layer
-#if !MULTIPLE_PTL_SUPPORT
-#if LIST_OF_PTL
-  vps->setNumProfileTierLevel( vps->getPTLForExtnPtr()->size() ); // +1 for the base VPS PTL()
-#else
-  vps->setNumOutputLayerSets(vps->getNumLayerSets());
-  vps->setNumProfileTierLevel(vps->getNumLayerSets());
-#endif
-#endif
-#endif
 #if VPS_DPB_SIZE_TABLE
   vps->deriveNumberOfSubDpbs();

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