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

Timestamp:

8 Jul 2015, 00:17:46 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0149_CROSS_LAYER_BLA_FLAG

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (2 diffs)
• TEncGOP.cpp (modified) (3 diffs)
• TEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -371 +371 @@
   Int       m_elRapSliceBEnabled;
   Int       m_adaptiveResolutionChange;
-  int       m_layerSwitchOffBegin;
-  int       m_layerSwitchOffEnd;
+  Int       m_layerSwitchOffBegin;
+  Int       m_layerSwitchOffEnd;
   Bool      m_altOutputLayerFlag;
   Int       m_skipPictureAtArcSwitch;
-#if O0149_CROSS_LAYER_BLA_FLAG
   Bool      m_crossLayerBLAFlag;
-#endif
 
   Int       m_numDirectRefLayers;
@@ -1024 +1022 @@
   Bool      getAltOuputLayerFlag() const                     { return m_altOutputLayerFlag; }
   Void      setAltOuputLayerFlag(Bool b)                     { m_altOutputLayerFlag = b;    }
-#if O0149_CROSS_LAYER_BLA_FLAG
   Bool      getCrossLayerBLAFlag() const                     { return m_crossLayerBLAFlag; }
   Void      setCrossLayerBLAFlag(Bool b)                     { m_crossLayerBLAFlag = b;    }
-#endif
 #if FAST_INTRA_SHVC
   Bool      getUseFastIntraScalable         ()               { return m_useFastIntraScalable; }

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

@@ -1195 +1195 @@
 #endif
 
-#if O0149_CROSS_LAYER_BLA_FLAG
     if( m_layerId == 0 && (getNalUnitType(pocCurr, m_iLastIDR, isField) == NAL_UNIT_CODED_SLICE_IDR_W_RADL || getNalUnitType(pocCurr, m_iLastIDR, isField) == NAL_UNIT_CODED_SLICE_IDR_N_LP) )
     {
@@ -1204 +1203 @@
       pcSlice->setCrossLayerBLAFlag(false);
     }
-#endif
 
     // Set the nal unit type
@@ -1232 +1230 @@
         m_pcEncTop->setNoClrasOutputFlag(true);
       }
-#if O0149_CROSS_LAYER_BLA_FLAG
-      else if ((pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP) &&
-               pcSlice->getCrossLayerBLAFlag())
+      else if( pcSlice->getCrossLayerBLAFlag() && ( pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP ) )
       {
         m_pcEncTop->setNoClrasOutputFlag(true);
       }
-#endif
       else
       {
         m_pcEncTop->setNoClrasOutputFlag(false);
       }
-      if (m_pcEncTop->getNoClrasOutputFlag())
+
+      if( m_pcEncTop->getNoClrasOutputFlag() )
       {
         for (UInt i = 0; i < m_pcCfg->getNumLayer(); i++)

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

@@ -1049 +1049 @@
   m_cPPS.setPPSId( m_iPPSIdCnt );
   m_cPPS.setSPSId( m_iSPSIdCnt );
-#if O0149_CROSS_LAYER_BLA_FLAG
-  if (m_crossLayerBLAFlag)
+
+  if( m_crossLayerBLAFlag )
   {
     m_cPPS.setNumExtraSliceHeaderBits( 3 );
   }
-#endif
+
   m_cPPS.setNumRefLayerLocationOffsets(m_numRefLayerLocationOffsets);
   for(Int i = 0; i < m_cPPS.getNumRefLayerLocationOffsets(); i++)