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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: DPB_PARAMS_MAXTLAYERS, MULTIPLE_PTL_SUPPORT

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (6 diffs)
• TEncTop.cpp (modified) (1 diff)

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

@@ -1333 +1333 @@
   for (Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
-#if MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION
     WRITE_FLAG( pcPTL->getSubLayerProfilePresentFlag(i), "sub_layer_profile_present_flag[i]" );
 #else
@@ -1355 +1355 @@
   for(Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
-#if MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION
     if( pcPTL->getSubLayerProfilePresentFlag(i) )
 #else
@@ -1373 +1373 @@
   WRITE_CODE( ptl->getProfileSpace(), 2 ,     "XXX_profile_space[]");
   WRITE_FLAG( ptl->getTierFlag()==Level::HIGH, "XXX_tier_flag[]"    );
-#if MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION
   WRITE_CODE( (ptl->getProfileIdc() == Profile::SCALABLEMAIN || ptl->getProfileIdc() == Profile::SCALABLEMAIN10) ? 7 : Int(ptl->getProfileIdc()), 5 ,  "XXX_profile_idc[]"  );
 #else
@@ -1401 +1401 @@
     WRITE_FLAG(0,                                    "general_one_picture_only_constraint_flag");
     WRITE_FLAG(ptl->getLowerBitRateConstraintFlag(), "general_lower_bit_rate_constraint_flag");
-#if MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION
     WRITE_CODE(0, 32,  "general_reserved_zero_34bits");  WRITE_CODE(0, 2,  "general_reserved_zero_34bits");
   }
@@ -1977 +1977 @@
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
-#if MULTIPLE_PTL_SUPPORT
     codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
-#else
-    codePTL( vps->getPTLForExtn(1), false, vps->getMaxTLayers() - 1 );
-#endif
   }
 
@@ -2112 +2108 @@
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
 
-#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());
-#endif
-  for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++)
-  {
-#if MULTIPLE_PTL_SUPPORT
+
+  for( Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++ )
+  {
     vps->setProfilePresentFlag(idx, true);
-#endif
+
     WRITE_FLAG( vps->getProfilePresentFlag(idx),       "vps_profile_present_flag[i]" );
-#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 );
-#endif
   }
 

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

@@ -240 +240 @@
 
   // set the VPS profile information
-#if !MULTIPLE_PTL_SUPPORT
-  *m_cVPS.getPTL() = *m_cSPS.getPTL();
-#endif
 #if VPS_VUI_BSP_HRD_PARAMS
   m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( true );
 #else
+  *m_cVPS.getPTL() = *m_cSPS.getPTL();
   m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( false );
 #endif