Changeset 1153 in SHVCSoftware

Timestamp:

8 Jul 2015, 00:28:51 (9 years ago)

Author:

seregin

Message:

macro cleanup: PER_LAYER_PTL

Location:

branches/SHM-dev/source

Files:

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

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

@@ -1591 +1591 @@
 #endif
 #endif
-#if !PER_LAYER_PTL
-  for(i = 1; i < vps->getNumLayerSets(); i++)
-  {
-    vps->setProfileLevelTierIdx(i, i);
-#if !OUTPUT_LAYER_SETS_CONFIG
-    vps->setOutputLayerSetIdx(i, i);
-#endif
-  }  
-#endif
 #endif
 #if VPS_DPB_SIZE_TABLE
@@ -1663 +1654 @@
 
 #if !MULTIPLE_PTL_SUPPORT
-#if PER_LAYER_PTL
   vps->getProfileLevelTierIdx()->resize(vps->getNumOutputLayerSets());
   vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0 ); // Default 0-th output layer set
@@ -1683 +1673 @@
     }
   }
-#endif
 #endif
 

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -2028 +2028 @@
   ::memset(m_directDependencyType, 0, sizeof(m_directDependencyType));
 
-#if !PER_LAYER_PTL
-  ::memset(m_profileLevelTierIdx,  0, sizeof(m_profileLevelTierIdx));
-#endif
   m_maxOneActiveRefLayerFlag = true;
 #if O0062_POC_LSB_NOT_PRESENT_FLAG
@@ -3563 +3560 @@
 }
 
-#if PER_LAYER_PTL
 Int TComVPS::calculateLenOfSyntaxElement( Int const numVal )
 {
@@ -3573 +3569 @@
   return numBits;
 }
-#endif
 
 Void TComVPS::calculateMaxSLInLayerSets()

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

@@ -678 +678 @@
 #endif
 #endif
-#if PER_LAYER_PTL
   std::vector< std::vector<Int> >  m_profileLevelTierIdx;
-#else
-  Int        m_profileLevelTierIdx[64];     
-#endif
   Bool       m_maxOneActiveRefLayerFlag;
 #if O0062_POC_LSB_NOT_PRESENT_FLAG
@@ -1058 +1054 @@
 #endif
 #endif
-#if PER_LAYER_PTL
+
   Bool getNecessaryLayerFlag(Int const i, Int const j) { return m_necessaryLayerFlag[i][j]; }
   std::vector< std::vector<Int> >* getProfileLevelTierIdx() { return &m_profileLevelTierIdx; }
@@ -1068 +1064 @@
 #endif
   Int    calculateLenOfSyntaxElement( Int const numVal );
-#else
-  Int    getProfileLevelTierIdx(Int i)                        { return m_profileLevelTierIdx[i]; }
-  Void   setProfileLevelTierIdx(Int i, Int x)                 { m_profileLevelTierIdx[i] = x   ; }
-#endif
+
   Bool   getMaxOneActiveRefLayerFlag()                                          { return m_maxOneActiveRefLayerFlag;             }
   Void   setMaxOneActiveRefLayerFlag(Bool x)                                    { m_maxOneActiveRefLayerFlag = x;                }

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

@@ -57 +57 @@
 #if PTL_SIGNALLING
 #define LIST_OF_PTL                      1      ///< JCTVC-R0272: Signalling the PTL for the 0-th OLS
-#define PER_LAYER_PTL                    1      ///< Signal profile-tier-level information for each layer.
 #endif
 #define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag

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

@@ -2874 +2874 @@
   READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
 #endif
-#if PER_LAYER_PTL
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
-#endif
 #if !MULTIPLE_PTL_SUPPORT
   vps->getPTLForExtnPtr()->resize(vps->getNumProfileTierLevel());
@@ -2951 +2949 @@
   vps->setOutputLayerFlag(0, 0, true);
   vps->deriveNecessaryLayerFlag(0);
-#if PER_LAYER_PTL
   vps->getProfileLevelTierIdx()->resize(numOutputLayerSets);
   vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0);
-#endif
 
   for(i = 1; i < numOutputLayerSets; i++)
@@ -3014 +3010 @@
     vps->deriveNecessaryLayerFlag(i);  
 
-#if PER_LAYER_PTL
     vps->getProfileLevelTierIdx(i)->assign(vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet), -1);
     for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++)
@@ -3044 +3039 @@
       }
     }
-#else
-    Int numBits = 1;
-    while ((1 << numBits) < (vps->getNumProfileTierLevel()))
-    {
-      numBits++;
-    }
-    READ_CODE( numBits, uiCode, "profile_tier_level_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
-#endif
 
     NumOutputLayersInOutputLayerSet[i] = 0;

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

@@ -2125 +2125 @@
 #else
   WRITE_UVLC( vps->getNumProfileTierLevel() - 1, "vps_num_profile_tier_level_minus1"); 
-#if PER_LAYER_PTL
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
-#endif
 #endif
 #if LIST_OF_PTL
@@ -2221 +2219 @@
       }
     }
-#if PER_LAYER_PTL
-    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 )
@@ -2229 +2227 @@
       }
     }
-#else
-    Int numBits = 1;
-    while ((1 << numBits) < (vps->getNumProfileTierLevel()))
-    {
-      numBits++;
-    }
-    WRITE_CODE( vps->getProfileLevelTierIdx(i), numBits, "profile_level_tier_idx[i]" );     
-#endif
 
     NumOutputLayersInOutputLayerSet[i] = 0;